Fix tests

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.DeleteByDocumentWithManyRelatedTables.approved.txt

@@ -1,5 +1,5 @@
 DELETE FROM [dbo].[TestDocumentTbl] WITH (ROWLOCK) WHERE [Id] = @Id
-DELETE FROM [RelatedDocument] WITH (ROWLOCK) WHERE [Id] = @Id
-DELETE FROM [OtherRelatedTable] WITH (ROWLOCK) WHERE [Id] = @Id
+DELETE FROM [dbo].[RelatedDocument] WITH (ROWLOCK) WHERE [Id] = @Id
+DELETE FROM [dbo].[OtherRelatedTable] WITH (ROWLOCK) WHERE [Id] = @Id
 
 @Id=Doc-1

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.DeleteByDocumentWithOneRelatedTable.approved.txt

@@ -1,4 +1,4 @@
 DELETE FROM [dbo].[TestDocumentTbl] WITH (ROWLOCK) WHERE [Id] = @Id
-DELETE FROM [RelatedDocument] WITH (ROWLOCK) WHERE [Id] = @Id
+DELETE FROM [dbo].[RelatedDocument] WITH (ROWLOCK) WHERE [Id] = @Id
 
 @Id=Doc-1

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.InsertMultipleDocumentWithManyRelatedDocuments.approved.txt

@@ -2,7 +2,7 @@ INSERT INTO [dbo].[TestDocumentTbl]  ([Id], [AColumn], [JSON]) VALUES
 (@0__Id, @0__AColumn, @0__JSON)
 ,(@1__Id, @1__AColumn, @1__JSON)
 ,(@2__Id, @2__AColumn, @2__JSON)
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
 (@0__Id, 'TestDocumentTbl', @relateddocument_0, 'OtherTbl')
 ,(@0__Id, 'TestDocumentTbl', @relateddocument_1, 'OtherTbl')
 ,(@2__Id, 'TestDocumentTbl', @relateddocument_2, 'OtherTbl')

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.InsertMultipleDocumentWithMultipleRelatedDocumentsMaps.approved.txt

@@ -1,9 +1,9 @@
 INSERT INTO [dbo].[TestDocumentTbl]  ([Id], [AColumn], [JSON]) VALUES 
 (@Id, @AColumn, @JSON)
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
 (@Id, 'TestDocumentTbl', @relateddocument_0, 'OtherTbl')
 ,(@Id, 'TestDocumentTbl', @relateddocument_1, 'OtherTbl')
-INSERT INTO [OtherRelatedTable] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
+INSERT INTO [dbo].[OtherRelatedTable] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
 (@Id, 'TestDocumentTbl', @otherrelatedtable_0, 'OtherTbl')
 ,(@Id, 'TestDocumentTbl', @otherrelatedtable_1, 'OtherTbl')
 

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.InsertSingleDocumentWithManyRelatedDocuments.approved.txt

@@ -1,6 +1,6 @@
 INSERT INTO [dbo].[TestDocumentTbl]  ([Id], [AColumn], [JSON]) VALUES 
 (@Id, @AColumn, @JSON)
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
 (@Id, 'TestDocumentTbl', @relateddocument_0, 'OtherTbl')
 ,(@Id, 'TestDocumentTbl', @relateddocument_1, 'OtherTbl')
 

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.InsertSingleDocumentWithOneRelatedDocument.approved.txt

@@ -1,6 +1,6 @@
 INSERT INTO [dbo].[TestDocumentTbl]  ([Id], [AColumn], [JSON]) VALUES 
 (@Id, @AColumn, @JSON)
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable]) VALUES
 (@Id, 'TestDocumentTbl', @relateddocument_0, 'OtherTbl')
 
 @Id=New-Id

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.UpdateWithManyRelatedDocuments.approved.txt

@@ -6,23 +6,23 @@ DELETE FROM @references
 
 INSERT INTO @references VALUES (@relateddocument_0, 'OtherTbl'), (@relateddocument_1, 'OtherTbl')
 
-DELETE FROM [RelatedDocument] WHERE [Id] = @Id
+DELETE FROM [dbo].[RelatedDocument] WHERE [Id] = @Id
     AND [RelatedDocumentId] not in (SELECT Reference FROM @references)
 
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
 SELECT @Id, 'TestDocumentTbl', Reference, ReferenceTable FROM @references t
-WHERE NOT EXISTS (SELECT null FROM [RelatedDocument] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
+WHERE NOT EXISTS (SELECT null FROM [dbo].[RelatedDocument] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
 
 DELETE FROM @references
 
 INSERT INTO @references VALUES (@otherrelatedtable_0, 'OtherTbl'), (@otherrelatedtable_1, 'OtherTbl')
 
-DELETE FROM [OtherRelatedTable] WHERE [Id] = @Id
+DELETE FROM [dbo].[OtherRelatedTable] WHERE [Id] = @Id
     AND [RelatedDocumentId] not in (SELECT Reference FROM @references)
 
-INSERT INTO [OtherRelatedTable] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
+INSERT INTO [dbo].[OtherRelatedTable] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
 SELECT @Id, 'TestDocumentTbl', Reference, ReferenceTable FROM @references t
-WHERE NOT EXISTS (SELECT null FROM [OtherRelatedTable] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
+WHERE NOT EXISTS (SELECT null FROM [dbo].[OtherRelatedTable] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
 
 @Id=Doc-1
 @JSON={}

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.UpdateWithNoRelatedDocuments.approved.txt

@@ -1,6 +1,6 @@
 UPDATE [dbo].[TestDocumentTbl]  SET [AColumn] = @AColumn, [JSON] = @JSON WHERE [Id] = @Id
 
-DELETE FROM [RelatedDocument] WHERE [Id] = @Id
+DELETE FROM [dbo].[RelatedDocument] WHERE [Id] = @Id
 
 @Id=Doc-1
 @JSON={}

source/Nevermore.Tests/Util/DataModificationQueryBuilderFixture.UpdateWithOneRelatedDocument.approved.txt

@@ -6,12 +6,12 @@ DELETE FROM @references
 
 INSERT INTO @references VALUES (@relateddocument_0, 'OtherTbl')
 
-DELETE FROM [RelatedDocument] WHERE [Id] = @Id
+DELETE FROM [dbo].[RelatedDocument] WHERE [Id] = @Id
     AND [RelatedDocumentId] not in (SELECT Reference FROM @references)
 
-INSERT INTO [RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
+INSERT INTO [dbo].[RelatedDocument] ([Id], [Table], [RelatedDocumentId], [RelatedDocumentTable])
 SELECT @Id, 'TestDocumentTbl', Reference, ReferenceTable FROM @references t
-WHERE NOT EXISTS (SELECT null FROM [RelatedDocument] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
+WHERE NOT EXISTS (SELECT null FROM [dbo].[RelatedDocument] r WHERE r.[Id] = @Id AND r.[RelatedDocumentId] = t.Reference )
 
 @Id=Doc-1
 @JSON={}

source/Nevermore/QueryBuilderExtensions.cs

@@ -15,7 +15,9 @@ public static class QueryBuilderExtensions
         /// <returns>A plain SQL string representing a create stored procedure query</returns>
         public static string AsStoredProcedure<TRecord>(this IQueryBuilder<TRecord> queryBuilder, string storedProcedureName, string schemaName = null) where TRecord : class
         {
-            return new StoredProcedure(queryBuilder.GetSelectBuilder().GenerateSelect(), queryBuilder.Parameters, queryBuilder.ParameterDefaults, storedProcedureName, schemaName).GenerateSql();
+            var select = queryBuilder.GetSelectBuilder().GenerateSelect();
+            schemaName ??= select.Schema;
+            return new StoredProcedure(select, queryBuilder.Parameters, queryBuilder.ParameterDefaults, storedProcedureName, schemaName).GenerateSql();
         }
 
         /// <summary>
@@ -28,8 +30,9 @@ public static string AsStoredProcedure<TRecord>(this IQueryBuilder<TRecord> quer
         /// <returns>A plain SQL string representing a create view query</returns>
         public static string AsView<TRecord>(this IQueryBuilder<TRecord> queryBuilder, string viewName, string schemaName = null) where TRecord : class
         {
-            schemaName ??= queryBuilder.GetSelectBuilder().GenerateSelect().Schema;
-            return new View(queryBuilder.GetSelectBuilder().GenerateSelect(), viewName, schemaName).GenerateSql();
+            var select = queryBuilder.GetSelectBuilder().GenerateSelect();
+            schemaName ??= select.Schema;
+            return new View(select, viewName, schemaName).GenerateSql();
         }
 
         /// <summary>
@@ -42,8 +45,9 @@ public static string AsView<TRecord>(this IQueryBuilder<TRecord> queryBuilder, s
         /// <returns>A plain SQL string representing a create function query</returns>
         public static string AsFunction<TRecord>(this IQueryBuilder<TRecord> queryBuilder, string functionName, string schemaName = null) where TRecord : class
         {
-            schemaName ??= queryBuilder.GetSelectBuilder().GenerateSelect().Schema;
-            return new Function(queryBuilder.GetSelectBuilder().GenerateSelect(), queryBuilder.Parameters, queryBuilder.ParameterDefaults, functionName, schemaName).GenerateSql();
+            var select = queryBuilder.GetSelectBuilder().GenerateSelect();
+            schemaName ??= select.Schema;
+            return new Function(select, queryBuilder.Parameters, queryBuilder.ParameterDefaults, functionName, schemaName).GenerateSql();
         }
     }
 }