Remove "dbo" schema from most tests.

test/EFCore.Jet.FunctionalTests/BatchingTest.cs

@@ -272,7 +272,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests
                 context.Database.EnsureCreatedResiliently();
                 context.Database.ExecuteSqlRaw(
                     @"
-ALTER TABLE dbo.Owners
+ALTER TABLE Owners
     ALTER COLUMN Name nvarchar(MAX);");
             }
 

test/EFCore.Jet.FunctionalTests/JetEndToEndTest.cs

@@ -467,17 +467,17 @@ namespace EntityFrameworkCore.Jet.FunctionalTests
                     Assert.Contains("INSERT", Fixture.TestSqlLoggerFactory.SqlStatements[4]);
 
                     var rows = await testDatabase.ExecuteScalarAsync<int>(
-                        $"SELECT Count(*) FROM `dbo`.`Blog` WHERE Id = {updatedId} AND Name = 'Blog is Updated'");
+                        $"SELECT Count(*) FROM `Blog` WHERE Id = {updatedId} AND Name = 'Blog is Updated'");
 
                     Assert.Equal(1, rows);
 
                     rows = await testDatabase.ExecuteScalarAsync<int>(
-                        $"SELECT Count(*) FROM `dbo`.`Blog` WHERE Id = {deletedId}");
+                        $"SELECT Count(*) FROM `Blog` WHERE Id = {deletedId}");
 
                     Assert.Equal(0, rows);
 
                     rows = await testDatabase.ExecuteScalarAsync<int>(
-                        $"SELECT Count(*) FROM `dbo`.`Blog` WHERE Id = {addedId} AND Name = 'Blog to Insert'");
+                        $"SELECT Count(*) FROM `Blog` WHERE Id = {addedId} AND Name = 'Blog to Insert'");
 
                     Assert.Equal(1, rows);
                 }

test/EFCore.Jet.FunctionalTests/JetMigrationSqlGeneratorTest.cs

@@ -25,7 +25,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests
             base.CreateTableOperation();
 
             AssertSql(
-                @"CREATE TABLE `dbo`.`People` (
+                @"CREATE TABLE `People` (
     `Id` int NOT NULL,
     `EmployerId` int NULL,
     `SSN` char(11) NULL,
@@ -354,7 +354,7 @@ EXEC sp_addextendedproperty 'MS_Description', 'My Comment 2', 'SCHEMA', 'dbo', '
                 });
 
             AssertSql(
-                @"ALTER TABLE `dbo`.`People` ADD `Birthday` datetime NOT NULL DEFAULT #01/01/2019 00:00:00#;
+                @"ALTER TABLE `People` ADD `Birthday` datetime NOT NULL DEFAULT #01/01/2019 00:00:00#;
 ");
         }
 
@@ -374,7 +374,7 @@ EXEC sp_addextendedproperty 'MS_Description', 'My Comment 2', 'SCHEMA', 'dbo', '
                 });
 
             AssertSql(
-                @"ALTER TABLE `dbo`.`People` ADD `Birthday` smalldatetime NOT NULL DEFAULT '2019-01-01T00:00:00';
+                @"ALTER TABLE `People` ADD `Birthday` smalldatetime NOT NULL DEFAULT '2019-01-01T00:00:00';
 ");
         }
 
@@ -523,10 +523,10 @@ EXEC sp_addextendedproperty 'MS_Description', 'My comment', 'SCHEMA', 'my', 'TAB
 SELECT @var0 = `d`.`name`
 FROM `sys`.`default_constraints` `d`
 INNER JOIN `sys`.`columns` `c` ON `d`.`parent_column_id` = `c`.`column_id` AND `d`.`parent_object_id` = `c`.`object_id`
-WHERE (`d`.`parent_object_id` = OBJECT_ID('`dbo`.`People`') AND `c`.`name` = 'LuckyNumber');
-IF @var0 IS NOT NULL EXEC('ALTER TABLE `dbo`.`People` DROP CONSTRAINT [' + @var0 + '];');
-ALTER TABLE `dbo`.`People` ALTER COLUMN `LuckyNumber` int NOT NULL;
-ALTER TABLE `dbo`.`People` ADD DEFAULT 7 FOR `LuckyNumber`;
+WHERE (`d`.`parent_object_id` = OBJECT_ID('`People`') AND `c`.`name` = 'LuckyNumber');
+IF @var0 IS NOT NULL EXEC('ALTER TABLE `People` DROP CONSTRAINT [' + @var0 + '];');
+ALTER TABLE `People` ALTER COLUMN `LuckyNumber` int NOT NULL;
+ALTER TABLE `People` ADD DEFAULT 7 FOR `LuckyNumber`;
 ");
         }
 
@@ -1134,9 +1134,9 @@ ALTER TABLE `Person` ALTER COLUMN `Id` bigint NOT NULL;
 SELECT @var0 = `d`.`name`
 FROM `sys`.`default_constraints` `d`
 INNER JOIN `sys`.`columns` `c` ON `d`.`parent_column_id` = `c`.`column_id` AND `d`.`parent_object_id` = `c`.`object_id`
-WHERE (`d`.`parent_object_id` = OBJECT_ID('`dbo`.`People`') AND `c`.`name` = 'LuckyNumber');
-IF @var0 IS NOT NULL EXEC('ALTER TABLE `dbo`.`People` DROP CONSTRAINT [' + @var0 + '];');
-ALTER TABLE `dbo`.`People` ALTER COLUMN `LuckyNumber` int NOT NULL;
+WHERE (`d`.`parent_object_id` = OBJECT_ID('`People`') AND `c`.`name` = 'LuckyNumber');
+IF @var0 IS NOT NULL EXEC('ALTER TABLE `People` DROP CONSTRAINT [' + @var0 + '];');
+ALTER TABLE `People` ALTER COLUMN `LuckyNumber` int NOT NULL;
 EXEC sp_addextendedproperty 'MS_Description', 'My Comment', 'SCHEMA', 'dbo', 'TABLE', 'People', 'COLUMN', 'LuckyNumber';
 ");
         }
@@ -1173,9 +1173,9 @@ EXEC sp_addextendedproperty 'MS_Description', 'My Comment', 'SCHEMA', 'dbo', 'TA
 SELECT @var0 = `d`.`name`
 FROM `sys`.`default_constraints` `d`
 INNER JOIN `sys`.`columns` `c` ON `d`.`parent_column_id` = `c`.`column_id` AND `d`.`parent_object_id` = `c`.`object_id`
-WHERE (`d`.`parent_object_id` = OBJECT_ID('`dbo`.`People`') AND `c`.`name` = 'Name');
-IF @var0 IS NOT NULL EXEC('ALTER TABLE `dbo`.`People` DROP CONSTRAINT [' + @var0 + '];');
-ALTER TABLE `dbo`.`People` ALTER COLUMN `Name` nvarchar(max) NOT NULL;
+WHERE (`d`.`parent_object_id` = OBJECT_ID('`People`') AND `c`.`name` = 'Name');
+IF @var0 IS NOT NULL EXEC('ALTER TABLE `People` DROP CONSTRAINT [' + @var0 + '];');
+ALTER TABLE `People` ALTER COLUMN `Name` nvarchar(max) NOT NULL;
 EXEC sp_dropextendedproperty 'MS_Description', 'SCHEMA', 'dbo', 'TABLE', 'People', 'COLUMN', 'Name';
 EXEC sp_addextendedproperty 'MS_Description', 'My Comment 2', 'SCHEMA', 'dbo', 'TABLE', 'People', 'COLUMN', 'Name';
 ");
@@ -1212,9 +1212,9 @@ EXEC sp_addextendedproperty 'MS_Description', 'My Comment 2', 'SCHEMA', 'dbo', '
 SELECT @var0 = `d`.`name`
 FROM `sys`.`default_constraints` `d`
 INNER JOIN `sys`.`columns` `c` ON `d`.`parent_column_id` = `c`.`column_id` AND `d`.`parent_object_id` = `c`.`object_id`
-WHERE (`d`.`parent_object_id` = OBJECT_ID('`dbo`.`People`') AND `c`.`name` = 'Name');
-IF @var0 IS NOT NULL EXEC('ALTER TABLE `dbo`.`People` DROP CONSTRAINT [' + @var0 + '];');
-ALTER TABLE `dbo`.`People` ALTER COLUMN `Name` nvarchar(max) NOT NULL;
+WHERE (`d`.`parent_object_id` = OBJECT_ID('`People`') AND `c`.`name` = 'Name');
+IF @var0 IS NOT NULL EXEC('ALTER TABLE `People` DROP CONSTRAINT [' + @var0 + '];');
+ALTER TABLE `People` ALTER COLUMN `Name` nvarchar(max) NOT NULL;
 EXEC sp_dropextendedproperty 'MS_Description', 'SCHEMA', 'dbo', 'TABLE', 'People', 'COLUMN', 'Name';
 ");
         }
@@ -1335,7 +1335,7 @@ END;
             base.CreateIndexOperation_unique();
 
             AssertSql(
-                @"CREATE UNIQUE INDEX `IX_People_Name` ON `dbo`.`People` (`FirstName`, `LastName`) WHERE `FirstName` IS NOT NULL AND `LastName` IS NOT NULL;
+                @"CREATE UNIQUE INDEX `IX_People_Name` ON `People` (`FirstName`, `LastName`) WHERE `FirstName` IS NOT NULL AND `LastName` IS NOT NULL;
 ");
         }
 
@@ -1354,7 +1354,7 @@ END;
                 });
 
             AssertSql(
-                @"CREATE UNIQUE INDEX `IX_People_Name` ON `dbo`.`People` (`FirstName`, `LastName`);
+                @"CREATE UNIQUE INDEX `IX_People_Name` ON `People` (`FirstName`, `LastName`);
 ");
         }
 
@@ -1564,7 +1564,7 @@ END;
                 });
 
             AssertSql(
-                @"ALTER TABLE `dbo`.`People` ADD INDEX `IX_People_Name` (`Name`);
+                @"ALTER TABLE `People` ADD INDEX `IX_People_Name` (`Name`);
 ");
         }
 
@@ -1647,9 +1647,9 @@ END;
 SELECT @var0 = `d`.`name`
 FROM `sys`.`default_constraints` `d`
 INNER JOIN `sys`.`columns` `c` ON `d`.`parent_column_id` = `c`.`column_id` AND `d`.`parent_object_id` = `c`.`object_id`
-WHERE (`d`.`parent_object_id` = OBJECT_ID('`dbo`.`People`') AND `c`.`name` = 'LuckyNumber');
-IF @var0 IS NOT NULL EXEC('ALTER TABLE `dbo`.`People` DROP CONSTRAINT [' + @var0 + '];');
-ALTER TABLE `dbo`.`People` DROP COLUMN `LuckyNumber`;
+WHERE (`d`.`parent_object_id` = OBJECT_ID('`People`') AND `c`.`name` = 'LuckyNumber');
+IF @var0 IS NOT NULL EXEC('ALTER TABLE `People` DROP CONSTRAINT [' + @var0 + '];');
+ALTER TABLE `People` DROP COLUMN `LuckyNumber`;
 ");
         }
 
@@ -1675,7 +1675,7 @@ DROP DATABASE `Northwind`;
             base.DropIndexOperation();
 
             AssertSql(
-                @"DROP INDEX `IX_People_Name` ON `dbo`.`People`;
+                @"DROP INDEX `IX_People_Name` ON `People`;
 ");
         }
 
@@ -1710,7 +1710,7 @@ DROP DATABASE `Northwind`;
                 });
 
             AssertSql(
-                @"ALTER SCHEMA `my` TRANSFER `dbo`.`EntityFrameworkHiLoSequence`;
+                @"ALTER SCHEMA `my` TRANSFER `EntityFrameworkHiLoSequence`;
 ");
         }
 
@@ -1728,7 +1728,7 @@ DROP DATABASE `Northwind`;
                 });
 
             AssertSql(
-                @"ALTER SCHEMA `my` TRANSFER `dbo`.`EntityFrameworkHiLoSequence`;
+                @"ALTER SCHEMA `my` TRANSFER `EntityFrameworkHiLoSequence`;
 ");
         }
 
@@ -1746,7 +1746,7 @@ DROP DATABASE `Northwind`;
 
             AssertSql(
                 @"DECLARE @defaultSchema sysname = SCHEMA_NAME();
-EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`EntityFrameworkHiLoSequence`;');
+EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `EntityFrameworkHiLoSequence`;');
 ");
         }
 
@@ -1762,7 +1762,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`EntityFrameworkHiLoS
                 });
 
             AssertSql(
-                @"ALTER SCHEMA `hr` TRANSFER `dbo`.`People`;
+                @"ALTER SCHEMA `hr` TRANSFER `People`;
 ");
         }
 
@@ -1780,7 +1780,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`EntityFrameworkHiLoS
                 });
 
             AssertSql(
-                @"ALTER SCHEMA `hr` TRANSFER `dbo`.`People`;
+                @"ALTER SCHEMA `hr` TRANSFER `People`;
 ");
         }
 
@@ -1798,7 +1798,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`EntityFrameworkHiLoS
 
             AssertSql(
                 @"DECLARE @defaultSchema sysname = SCHEMA_NAME();
-EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
+EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `People`;');
 ");
         }
 
@@ -1815,7 +1815,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
                 });
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`People`.`Name`', 'FullName', 'COLUMN';
+                @"EXEC sp_rename '`People`.`Name`', 'FullName', 'COLUMN';
 ");
         }
 
@@ -1832,7 +1832,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
                 });
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`People`.`IX_People_Name`', 'IX_People_FullName', 'INDEX';
+                @"EXEC sp_rename '`People`.`IX_People_Name`', 'IX_People_FullName', 'INDEX';
 ");
         }
 
@@ -1863,7 +1863,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
                 });
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`EntityFrameworkHiLoSequence`', 'MySequence';
+                @"EXEC sp_rename '`EntityFrameworkHiLoSequence`', 'MySequence';
 ");
         }
 
@@ -1881,7 +1881,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
                 });
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`EntityFrameworkHiLoSequence`', 'MySequence';
+                @"EXEC sp_rename '`EntityFrameworkHiLoSequence`', 'MySequence';
 ");
         }
 
@@ -1891,7 +1891,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
             base.RenameTableOperation_legacy();
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`People`', 'Person';
+                @"EXEC sp_rename '`People`', 'Person';
 ");
         }
 
@@ -1901,7 +1901,7 @@ EXEC('ALTER SCHEMA [' + @defaultSchema + '] TRANSFER `dbo`.`People`;');
             base.RenameTableOperation();
 
             AssertSql(
-                @"EXEC sp_rename '`dbo`.`People`', 'Person';
+                @"EXEC sp_rename '`People`', 'Person';
 ");
         }
 

test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTest.cs

@@ -330,7 +330,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests
                     context.Database.ExecuteSqlRaw
                     (
                         @"CREATE FUNCTION
-`dbo`.`GetFullName`(@First NVARCHAR(MAX), @Second NVARCHAR(MAX))
+`GetFullName`(@First NVARCHAR(MAX), @Second NVARCHAR(MAX))
 RETURNS NVARCHAR(MAX) WITH SCHEMABINDING AS BEGIN RETURN @First + @Second END");
 
                     context.GetService<IRelationalDatabaseCreator>().CreateTables();
@@ -372,7 +372,7 @@ RETURNS NVARCHAR(MAX) WITH SCHEMABINDING AS BEGIN RETURN @First + @Second END");
             {
                 modelBuilder.Entity<FullNameBlog>()
                     .Property(e => e.FullName)
-                    .HasComputedColumnSql("`dbo`.`GetFullName`(`FirstName`, `LastName`)")
+                    .HasComputedColumnSql("`GetFullName`(`FirstName`, `LastName`)")
                     .Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Throw);
             }
         }
@@ -387,18 +387,18 @@ RETURNS NVARCHAR(MAX) WITH SCHEMABINDING AS BEGIN RETURN @First + @Second END");
                 {
                     context.GetService<IRelationalDatabaseCreator>().CreateTables();
 
-                    context.Database.ExecuteSqlRaw("ALTER TABLE dbo.FullNameBlogs DROP COLUMN FullName;");
+                    context.Database.ExecuteSqlRaw("ALTER TABLE FullNameBlogs DROP COLUMN FullName;");
 
                     context.Database.ExecuteSqlRaw(
-                        @"CREATE FUNCTION `dbo`.`GetFullName`(@Id int)
+                        @"CREATE FUNCTION `GetFullName`(@Id int)
 RETURNS NVARCHAR(MAX) WITH SCHEMABINDING AS
 BEGIN
     DECLARE @FullName NVARCHAR(MAX);
-    SELECT @FullName = `FirstName` + `LastName` FROM `dbo`.`FullNameBlogs` WHERE `Id` = @Id;
+    SELECT @FullName = `FirstName` + `LastName` FROM `FullNameBlogs` WHERE `Id` = @Id;
     RETURN @FullName
 END");
 
-                    context.Database.ExecuteSqlRaw("ALTER TABLE dbo.FullNameBlogs ADD FullName AS `dbo`.`GetFullName`(`Id`); ");
+                    context.Database.ExecuteSqlRaw("ALTER TABLE FullNameBlogs ADD FullName AS `GetFullName`(`Id`); ");
                 }
 
                 try
@@ -443,8 +443,8 @@ END");
                 {
                     using (var context = new BlogContextComputedColumn(testStore.Name))
                     {
-                        context.Database.ExecuteSqlRaw("ALTER TABLE dbo.FullNameBlogs DROP COLUMN FullName;");
-                        context.Database.ExecuteSqlRaw("DROP FUNCTION `dbo`.`GetFullName`;");
+                        context.Database.ExecuteSqlRaw("ALTER TABLE FullNameBlogs DROP COLUMN FullName;");
+                        context.Database.ExecuteSqlRaw("DROP FUNCTION `GetFullName`;");
                     }
                 }
             }

test/EFCore.Jet.FunctionalTests/Query/AsyncSimpleQueryJetTest.cs

@@ -127,7 +127,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
                     {
                         // Outer query is buffered by default
                         await context.Database.ExecuteSqlRawAsync(
-                            "`dbo`.`CustOrderHist` @CustomerID = {0}",
+                            "`CustOrderHist` @CustomerID = {0}",
                             asyncEnumerator.Current.CustomerID);
                     }
                 }

test/EFCore.Jet.FunctionalTests/Query/FromSqlSprocQueryJetTest.cs

@@ -18,7 +18,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
         {
             await base.From_sql_queryable_stored_procedure(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_with_tag(bool async)
@@ -28,14 +28,14 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             AssertSql(
                 @"-- Stored Procedure
 
-`dbo`.`Ten Most Expensive Products`");
+`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_projection(bool async)
         {
             await base.From_sql_queryable_stored_procedure_projection(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_with_parameter(bool async)
@@ -45,21 +45,21 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             AssertSql(
                 @"p0='ALFKI' (Size = 4000)
 
-`dbo`.`CustOrderHist` @CustomerID = @p0");
+`CustOrderHist` @CustomerID = @p0");
         }
 
         public override async Task From_sql_queryable_stored_procedure_re_projection_on_client(bool async)
         {
             await base.From_sql_queryable_stored_procedure_re_projection_on_client(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_composed_on_client(bool async)
         {
             await base.From_sql_queryable_stored_procedure_composed_on_client(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_with_parameter_composed_on_client(bool async)
@@ -69,28 +69,28 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             AssertSql(
                 @"p0='ALFKI' (Size = 4000)
 
-`dbo`.`CustOrderHist` @CustomerID = @p0");
+`CustOrderHist` @CustomerID = @p0");
         }
 
         public override async Task From_sql_queryable_stored_procedure_take_on_client(bool async)
         {
             await base.From_sql_queryable_stored_procedure_take_on_client(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override async Task From_sql_queryable_stored_procedure_min_on_client(bool async)
         {
             await base.From_sql_queryable_stored_procedure_min_on_client(async);
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 
-        protected override string TenMostExpensiveProductsSproc => "`dbo`.`Ten Most Expensive Products`";
+        protected override string TenMostExpensiveProductsSproc => "`Ten Most Expensive Products`";
 
-        protected override string CustomerOrderHistorySproc => "`dbo`.`CustOrderHist` @CustomerID = {0}";
+        protected override string CustomerOrderHistorySproc => "`CustOrderHist` @CustomerID = {0}";
     }
 }

test/EFCore.Jet.FunctionalTests/Query/MappingQueryJetTest.cs

@@ -15,7 +15,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
 
             AssertSql(
                 @"SELECT `c`.`CustomerID`, `c`.`CompanyName`
-FROM `dbo`.`Customers` AS `c`");
+FROM `Customers` AS `c`");
         }
 
         public override void All_employees()
@@ -24,7 +24,7 @@ FROM `dbo`.`Customers` AS `c`");
 
             AssertSql(
                 @"SELECT `e`.`EmployeeID`, `e`.`City`
-FROM `dbo`.`Employees` AS `e`");
+FROM `Employees` AS `e`");
         }
 
         public override void All_orders()
@@ -33,7 +33,7 @@ FROM `dbo`.`Employees` AS `e`");
 
             AssertSql(
                 @"SELECT `o`.`OrderID`, `o`.`ShipVia`
-FROM `dbo`.`Orders` AS `o`");
+FROM `Orders` AS `o`");
         }
 
         public override void Project_nullable_enum()
@@ -42,7 +42,7 @@ FROM `dbo`.`Orders` AS `o`");
 
             AssertSql(
                 @"SELECT `o`.`ShipVia`
-FROM `dbo`.`Orders` AS `o`");
+FROM `Orders` AS `o`");
         }
 
         public MappingQueryJetTest(MappingQueryJetFixture fixture)

test/EFCore.Jet.FunctionalTests/Query/QueryBugsTest.cs

@@ -283,26 +283,26 @@ WHERE (((((((((`d`.`SmallDateTime` IN ('1970-09-03T12:00:00', '1971-09-03T12:00:
             {
                 testStore.ExecuteNonQuery(
                     @"
-CREATE TABLE `dbo`.`Customers`(
+CREATE TABLE `Customers`(
     `CustomerID` `int` NOT NULL PRIMARY KEY,
     `CustomerName` `varchar`(120) NULL,
     `PostcodeID` `int` NULL);
 
-CREATE TABLE `dbo`.`Postcodes`(
+CREATE TABLE `Postcodes`(
     `PostcodeID` `int` NOT NULL PRIMARY KEY,
     `PostcodeValue` `varchar`(100) NOT NULL,
     `TownName` `varchar`(255) NOT NULL);
 
-INSERT `dbo`.`Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (1, 'Sam Tippet', 5);
-INSERT `dbo`.`Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (2, 'William Greig', 2);
-INSERT `dbo`.`Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (3, 'Steve Jones', 3);
-INSERT `dbo`.`Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (4, 'Jim Warren', NULL);
-INSERT `dbo`.`Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (5, 'Andrew Smith', 5);
+INSERT `Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (1, 'Sam Tippet', 5);
+INSERT `Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (2, 'William Greig', 2);
+INSERT `Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (3, 'Steve Jones', 3);
+INSERT `Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (4, 'Jim Warren', NULL);
+INSERT `Customers` (`CustomerID`, `CustomerName`, `PostcodeID`) VALUES (5, 'Andrew Smith', 5);
 
-INSERT `dbo`.`Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (2, '1000', 'Town 1');
-INSERT `dbo`.`Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (3, '2000', 'Town 2');
-INSERT `dbo`.`Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (4, '3000', 'Town 3');
-INSERT `dbo`.`Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (5, '4000', 'Town 4');
+INSERT `Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (2, '1000', 'Town 1');
+INSERT `Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (3, '2000', 'Town 2');
+INSERT `Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (4, '3000', 'Town 3');
+INSERT `Postcodes` (`PostcodeID`, `PostcodeValue`, `TownName`) VALUES (5, '4000', 'Town 4');
 ");
 
                 using (var context = new Bug6091Context(Fixture.CreateOptions(testStore)))
@@ -2657,7 +2657,7 @@ WHERE `w`.`Val` = 1");
                     Assert.Equal(3, result);
 
                     AssertSql(
-                        @"SELECT TOP 2 `dbo`.`AddTwo`(`w`.`Val`)
+                        @"SELECT TOP 2 `AddTwo`(`w`.`Val`)
 FROM `foo`.`Widgets` AS `w`
 WHERE `w`.`Val` = 1");
                 }
@@ -2685,7 +2685,7 @@ WHERE `w`.`Val` = 1");
                                                             END");
 
                     context.Database.ExecuteSqlRaw(
-                        @"CREATE FUNCTION dbo.AddTwo (@num int)
+                        @"CREATE FUNCTION AddTwo (@num int)
                                                             RETURNS int
                                                                 AS
                                                             BEGIN
@@ -2761,7 +2761,7 @@ WHERE `w`.`Val` = 1");
                     Assert.Equal(0, valueParam.Value);
 
                     var blogs = context.Blogs.FromSqlRaw(
-                            "`dbo`.`GetPersonAndVoteCount`  @id, @Value out",
+                            "`GetPersonAndVoteCount`  @id, @Value out",
                             new OleDbParameter { ParameterName = "id", Value = 1 },
                             valueParam)
                         .ToList();
@@ -2779,7 +2779,7 @@ WHERE `w`.`Val` = 1");
                 context =>
                 {
                     context.Database.ExecuteSqlRaw(
-                        @"CREATE PROCEDURE `dbo`.`GetPersonAndVoteCount`
+                        @"CREATE PROCEDURE `GetPersonAndVoteCount`
  (
     @id int,
     @Value int OUTPUT
@@ -2787,10 +2787,10 @@ WHERE `w`.`Val` = 1");
 AS
 BEGIN
     SELECT @Value = SomeValue
-    FROM dbo.Blogs
+    FROM Blogs
     WHERE Id = @id;
     SELECT *
-    FROM dbo.Blogs
+    FROM Blogs
     WHERE Id = @id;
     END");
 

test/EFCore.Jet.FunctionalTests/Query/SqlExecutorJetTest.cs

@@ -24,7 +24,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
         {
             base.Executes_stored_procedure();
 
-            AssertSql("`dbo`.`Ten Most Expensive Products`");
+            AssertSql("`Ten Most Expensive Products`");
         }
 
         public override void Executes_stored_procedure_with_parameter()
@@ -34,7 +34,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             AssertSql(
                 @"@CustomerID='ALFKI' (Nullable = false) (Size = 5)
 
-`dbo`.`CustOrderHist` @CustomerID");
+`CustOrderHist` @CustomerID");
         }
 
         public override void Executes_stored_procedure_with_generated_parameter()
@@ -44,7 +44,7 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
             AssertSql(
                 @"@p0='ALFKI' (Size = 4000)
 
-`dbo`.`CustOrderHist` @CustomerID = @p0");
+`CustOrderHist` @CustomerID = @p0");
         }
 
         public override void Query_with_parameters()
@@ -140,9 +140,9 @@ SELECT COUNT(*) FROM ""Customers"" WHERE ""City"" = @p0 AND ""ContactTitle"" = @
         protected override DbParameter CreateDbParameter(string name, object value)
             => new OleDbParameter { ParameterName = name, Value = value };
 
-        protected override string TenMostExpensiveProductsSproc => "`dbo`.`Ten Most Expensive Products`";
-        protected override string CustomerOrderHistorySproc => "`dbo`.`CustOrderHist` @CustomerID";
-        protected override string CustomerOrderHistoryWithGeneratedParameterSproc => "`dbo`.`CustOrderHist` @CustomerID = {0}";
+        protected override string TenMostExpensiveProductsSproc => "`Ten Most Expensive Products`";
+        protected override string CustomerOrderHistorySproc => "`CustOrderHist` @CustomerID";
+        protected override string CustomerOrderHistoryWithGeneratedParameterSproc => "`CustOrderHist` @CustomerID = {0}";
 
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);

test/EFCore.Jet.FunctionalTests/Query/UdfDbFunctionJetTests.cs

@@ -52,7 +52,7 @@ WHERE `c`.`Id` = @__customerId_0");
             AssertSql(
                 @"@__customerId_0='1'
 
-SELECT `dbo`.`CustomerOrderCount`(@__customerId_0)
+SELECT `CustomerOrderCount`(@__customerId_0)
 FROM `Customers` AS `c`");
         }
 
@@ -61,7 +61,7 @@ FROM `Customers` AS `c`");
             base.Scalar_Function_Anonymous_Type_Select_Correlated_Static();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 1");
         }
@@ -71,7 +71,7 @@ WHERE `c`.`Id` = 1");
             base.Scalar_Function_Anonymous_Type_Select_Not_Correlated_Static();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(1) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(1) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 1");
         }
@@ -83,7 +83,7 @@ WHERE `c`.`Id` = 1");
             AssertSql(
                 @"@__customerId_0='1'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(@__customerId_0) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(@__customerId_0) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_0");
         }
@@ -96,7 +96,7 @@ WHERE `c`.`Id` = @__customerId_0");
                 @"@__starCount_1='3'
 @__customerId_0='3'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`StarValue`(@__starCount_1, `dbo`.`CustomerOrderCount`(@__customerId_0)) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `StarValue`(@__starCount_1, `CustomerOrderCount`(@__customerId_0)) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_0");
         }
@@ -108,7 +108,7 @@ WHERE `c`.`Id` = @__customerId_0");
             AssertSql(
                 @"SELECT LOWER(CONVERT(VARCHAR(11), `c`.`Id`))
 FROM `Customers` AS `c`
-WHERE `dbo`.`IsTopCustomer`(`c`.`Id`) = True");
+WHERE `IsTopCustomer`(`c`.`Id`) = True");
         }
 
         public override void Scalar_Function_Where_Not_Correlated_Static()
@@ -120,7 +120,7 @@ WHERE `dbo`.`IsTopCustomer`(`c`.`Id`) = True");
 
 SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `dbo`.`GetCustomerWithMostOrdersAfterDate`(@__startDate_0) = `c`.`Id`");
+WHERE `GetCustomerWithMostOrdersAfterDate`(@__startDate_0) = `c`.`Id`");
         }
 
         public override void Scalar_Function_Where_Parameter_Static()
@@ -132,7 +132,7 @@ WHERE `dbo`.`GetCustomerWithMostOrdersAfterDate`(@__startDate_0) = `c`.`Id`");
 
 SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingPeriodStartDate`(@__period_0))");
+WHERE `c`.`Id` = `GetCustomerWithMostOrdersAfterDate`(`GetReportingPeriodStartDate`(@__period_0))");
         }
 
         public override void Scalar_Function_Where_Nested_Static()
@@ -142,7 +142,7 @@ WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingP
             AssertSql(
                 @"SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingPeriodStartDate`(0))");
+WHERE `c`.`Id` = `GetCustomerWithMostOrdersAfterDate`(`GetReportingPeriodStartDate`(0))");
         }
 
         public override void Scalar_Function_Let_Correlated_Static()
@@ -150,7 +150,7 @@ WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingP
             base.Scalar_Function_Let_Correlated_Static();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 2");
         }
@@ -160,7 +160,7 @@ WHERE `c`.`Id` = 2");
             base.Scalar_Function_Let_Not_Correlated_Static();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(2) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(2) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 2");
         }
@@ -172,7 +172,7 @@ WHERE `c`.`Id` = 2");
             AssertSql(
                 @"@__customerId_0='2'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(@__customerId_0) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(@__customerId_0) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_0");
         }
@@ -185,7 +185,7 @@ WHERE `c`.`Id` = @__customerId_0");
                 @"@__starCount_0='3'
 @__customerId_1='1'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`StarValue`(@__starCount_0, `dbo`.`CustomerOrderCount`(@__customerId_1)) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `StarValue`(@__starCount_0, `CustomerOrderCount`(@__customerId_1)) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_1");
         }
@@ -207,7 +207,7 @@ ORDER BY `c`.`Id`");
             AssertSql(
                 @"SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
+WHERE 3 = `CustomerOrderCount`(ABS(`c`.`Id`))");
         }
 
         public override void Nullable_navigation_property_access_preserves_schema_for_sql_function()
@@ -215,7 +215,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
             base.Nullable_navigation_property_access_preserves_schema_for_sql_function();
 
             AssertSql(
-                @"SELECT TOP 1 `dbo`.`IdentityString`(`c`.`FirstName`)
+                @"SELECT TOP 1 `IdentityString`(`c`.`FirstName`)
 FROM `Orders` AS `o`
 LEFT JOIN `Customers` AS `c` ON `o`.`CustomerId` = `c`.`Id`
 ORDER BY `o`.`Id`");
@@ -240,7 +240,7 @@ WHERE `c`.`LastName` = 'Two'");
             base.Scalar_Function_Non_Static();
 
             AssertSql(
-                @"SELECT TOP 2 `dbo`.`StarValue`(4, `c`.`Id`) AS `Id`, `dbo`.`DollarValue`(2, `c`.`LastName`) AS `LastName`
+                @"SELECT TOP 2 `StarValue`(4, `c`.`Id`) AS `Id`, `DollarValue`(2, `c`.`LastName`) AS `LastName`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 1");
         }
@@ -274,7 +274,7 @@ WHERE `c`.`Id` = @__customerId_0");
             AssertSql(
                 @"@__customerId_1='1'
 
-SELECT `dbo`.`CustomerOrderCount`(@__customerId_1)
+SELECT `CustomerOrderCount`(@__customerId_1)
 FROM `Customers` AS `c`");
         }
 
@@ -283,7 +283,7 @@ FROM `Customers` AS `c`");
             base.Scalar_Function_Anonymous_Type_Select_Correlated_Instance();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 1");
         }
@@ -293,7 +293,7 @@ WHERE `c`.`Id` = 1");
             base.Scalar_Function_Anonymous_Type_Select_Not_Correlated_Instance();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(1) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(1) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 1");
         }
@@ -305,7 +305,7 @@ WHERE `c`.`Id` = 1");
             AssertSql(
                 @"@__customerId_0='1'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(@__customerId_0) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(@__customerId_0) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_0");
         }
@@ -318,7 +318,7 @@ WHERE `c`.`Id` = @__customerId_0");
                 @"@__starCount_2='3'
 @__customerId_0='3'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`StarValue`(@__starCount_2, `dbo`.`CustomerOrderCount`(@__customerId_0)) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `StarValue`(@__starCount_2, `CustomerOrderCount`(@__customerId_0)) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_0");
         }
@@ -330,7 +330,7 @@ WHERE `c`.`Id` = @__customerId_0");
             AssertSql(
                 @"SELECT LOWER(CONVERT(VARCHAR(11), `c`.`Id`))
 FROM `Customers` AS `c`
-WHERE `dbo`.`IsTopCustomer`(`c`.`Id`) = True");
+WHERE `IsTopCustomer`(`c`.`Id`) = True");
         }
 
         public override void Scalar_Function_Where_Not_Correlated_Instance()
@@ -342,7 +342,7 @@ WHERE `dbo`.`IsTopCustomer`(`c`.`Id`) = True");
 
 SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `dbo`.`GetCustomerWithMostOrdersAfterDate`(@__startDate_1) = `c`.`Id`");
+WHERE `GetCustomerWithMostOrdersAfterDate`(@__startDate_1) = `c`.`Id`");
         }
 
         public override void Scalar_Function_Where_Parameter_Instance()
@@ -354,7 +354,7 @@ WHERE `dbo`.`GetCustomerWithMostOrdersAfterDate`(@__startDate_1) = `c`.`Id`");
 
 SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingPeriodStartDate`(@__period_1))");
+WHERE `c`.`Id` = `GetCustomerWithMostOrdersAfterDate`(`GetReportingPeriodStartDate`(@__period_1))");
         }
 
         public override void Scalar_Function_Where_Nested_Instance()
@@ -364,7 +364,7 @@ WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingP
             AssertSql(
                 @"SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingPeriodStartDate`(0))");
+WHERE `c`.`Id` = `GetCustomerWithMostOrdersAfterDate`(`GetReportingPeriodStartDate`(0))");
         }
 
         public override void Scalar_Function_Let_Correlated_Instance()
@@ -372,7 +372,7 @@ WHERE `c`.`Id` = `dbo`.`GetCustomerWithMostOrdersAfterDate`(`dbo`.`GetReportingP
             base.Scalar_Function_Let_Correlated_Instance();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(`c`.`Id`) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 2");
         }
@@ -382,7 +382,7 @@ WHERE `c`.`Id` = 2");
             base.Scalar_Function_Let_Not_Correlated_Instance();
 
             AssertSql(
-                @"SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(2) AS `OrderCount`
+                @"SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(2) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = 2");
         }
@@ -394,7 +394,7 @@ WHERE `c`.`Id` = 2");
             AssertSql(
                 @"@__customerId_1='2'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`CustomerOrderCount`(@__customerId_1) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `CustomerOrderCount`(@__customerId_1) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_1");
         }
@@ -407,7 +407,7 @@ WHERE `c`.`Id` = @__customerId_1");
                 @"@__starCount_1='3'
 @__customerId_2='1'
 
-SELECT TOP 2 `c`.`LastName`, `dbo`.`StarValue`(@__starCount_1, `dbo`.`CustomerOrderCount`(@__customerId_2)) AS `OrderCount`
+SELECT TOP 2 `c`.`LastName`, `StarValue`(@__starCount_1, `CustomerOrderCount`(@__customerId_2)) AS `OrderCount`
 FROM `Customers` AS `c`
 WHERE `c`.`Id` = @__customerId_2");
         }
@@ -429,7 +429,7 @@ ORDER BY `c`.`Id`");
             AssertSql(
                 @"SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE 3 = ABS(`dbo`.`CustomerOrderCount`(`c`.`Id`))");
+WHERE 3 = ABS(`CustomerOrderCount`(`c`.`Id`))");
         }
 
         public override void Scalar_Nested_Function_UDF_BCL_Instance()
@@ -439,7 +439,7 @@ WHERE 3 = ABS(`dbo`.`CustomerOrderCount`(`c`.`Id`))");
             AssertSql(
                 @"SELECT TOP 2 `c`.`Id`
 FROM `Customers` AS `c`
-WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
+WHERE 3 = `CustomerOrderCount`(ABS(`c`.`Id`))");
         }
 
         #endregion
@@ -456,7 +456,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                 base.Seed(context);
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function `dbo`.`CustomerOrderCount` (@customerId int)
+                    @"create function `CustomerOrderCount` (@customerId int)
                                                     returns int
                                                     as
                                                     begin
@@ -464,7 +464,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function`dbo`.`StarValue` (@starCount int, @value nvarchar(max))
+                    @"create function`StarValue` (@starCount int, @value nvarchar(max))
                                                     returns nvarchar(max)
                                                         as
                                                         begin
@@ -472,7 +472,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function`dbo`.`DollarValue` (@starCount int, @value nvarchar(max))
+                    @"create function`DollarValue` (@starCount int, @value nvarchar(max))
                                                     returns nvarchar(max)
                                                         as
                                                         begin
@@ -480,7 +480,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function `dbo`.`GetReportingPeriodStartDate` (@period int)
+                    @"create function `GetReportingPeriodStartDate` (@period int)
                                                     returns DateTime
                                                     as
                                                     begin
@@ -488,7 +488,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function `dbo`.`GetCustomerWithMostOrdersAfterDate` (@searchDate Date)
+                    @"create function `GetCustomerWithMostOrdersAfterDate` (@searchDate Date)
                                                     returns int
                                                     as
                                                     begin
@@ -500,7 +500,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function `dbo`.`IsTopCustomer` (@customerId int)
+                    @"create function `IsTopCustomer` (@customerId int)
                                                     returns bit
                                                     as
                                                     begin
@@ -511,7 +511,7 @@ WHERE 3 = `dbo`.`CustomerOrderCount`(ABS(`c`.`Id`))");
                                                     end");
 
                 context.Database.ExecuteSqlRaw(
-                    @"create function `dbo`.`IdentityString` (@customerName nvarchar(max))
+                    @"create function `IdentityString` (@customerName nvarchar(max))
                                                     returns nvarchar(max)
                                                     as
                                                     begin

test/EFCore.Jet.FunctionalTests/Scaffolding/JetDatabaseModelFactoryTest.cs

@@ -57,9 +57,9 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Scaffolding
         {
             Test(
                 @"
-CREATE TABLE `dbo`.`Everest` ( id int );
+CREATE TABLE `Everest` ( id int );
 
-CREATE TABLE `dbo`.`Denali` ( id int );",
+CREATE TABLE `Denali` ( id int );",
                 Enumerable.Empty<string>(),
                 Enumerable.Empty<string>(),
                 dbModel =>
@@ -78,9 +78,9 @@ CREATE TABLE `dbo`.`Denali` ( id int );",
                         });
                 },
                 @"
-DROP TABLE `dbo`.`Everest`;
+DROP TABLE `Everest`;
 
-DROP TABLE `dbo`.`Denali`;");
+DROP TABLE `Denali`;");
         }
 
         #endregion
@@ -94,7 +94,7 @@ DROP TABLE `dbo`.`Denali`;");
                 @"
 CREATE TABLE `db2`.`K2` ( Id int, A varchar, UNIQUE (A ) );
 
-CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B));",
+CREATE TABLE `Kilimanjaro` ( Id int, B varchar, UNIQUE (B));",
                 Enumerable.Empty<string>(),
                 new[] { "db2" },
                 dbModel =>
@@ -107,7 +107,7 @@ CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B));",
                     Assert.Empty(table.ForeignKeys);
                 },
                 @"
-DROP TABLE `dbo`.`Kilimanjaro`;
+DROP TABLE `Kilimanjaro`;
 
 DROP TABLE `db2`.`K2`;");
         }
@@ -117,9 +117,9 @@ DROP TABLE `db2`.`K2`;");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.`K2` ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE `K2` ( Id int, A varchar, UNIQUE (A ) );
 
-CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B), FOREIGN KEY (B) REFERENCES K2 (A) );",
+CREATE TABLE `Kilimanjaro` ( Id int, B varchar, UNIQUE (B), FOREIGN KEY (B) REFERENCES K2 (A) );",
                 new[] { "K2" },
                 Enumerable.Empty<string>(),
                 dbModel =>
@@ -132,9 +132,9 @@ CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B), FOREIGN KEY (B
                     Assert.Empty(table.ForeignKeys);
                 },
                 @"
-DROP TABLE `dbo`.`Kilimanjaro`;
+DROP TABLE `Kilimanjaro`;
 
-DROP TABLE `dbo`.`K2`;");
+DROP TABLE `K2`;");
         }
 
         [ConditionalFact]
@@ -142,9 +142,9 @@ DROP TABLE `dbo`.`K2`;");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.[K.2] ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE [K.2] ( Id int, A varchar, UNIQUE (A ) );
 
-CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
+CREATE TABLE `Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                 new[] { "[K.2]" },
                 Enumerable.Empty<string>(),
                 dbModel =>
@@ -157,9 +157,9 @@ CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                     Assert.Empty(table.ForeignKeys);
                 },
                 @"
-DROP TABLE `dbo`.`Kilimanjaro`;
+DROP TABLE `Kilimanjaro`;
 
-DROP TABLE `dbo`.[K.2];");
+DROP TABLE [K.2];");
         }
 
         [ConditionalFact]
@@ -167,12 +167,12 @@ DROP TABLE `dbo`.[K.2];");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.`K2` ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE `K2` ( Id int, A varchar, UNIQUE (A ) );
 
 CREATE TABLE `db2`.`K2` ( Id int, A varchar, UNIQUE (A ) );
 
-CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
-                new[] { "dbo.K2" },
+CREATE TABLE `Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
+                new[] { "K2" },
                 Enumerable.Empty<string>(),
                 dbModel =>
                 {
@@ -184,9 +184,9 @@ CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                     Assert.Empty(table.ForeignKeys);
                 },
                 @"
-DROP TABLE `dbo`.`Kilimanjaro`;
+DROP TABLE `Kilimanjaro`;
 
-DROP TABLE `dbo`.`K2`;
+DROP TABLE `K2`;
 
 DROP TABLE `db2`.`K2`;");
         }
@@ -196,7 +196,7 @@ DROP TABLE `db2`.`K2`;");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.[K.2] ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE [K.2] ( Id int, A varchar, UNIQUE (A ) );
 
 CREATE TABLE [db.2].[K.2] ( Id int, A varchar, UNIQUE (A ) );
 
@@ -215,7 +215,7 @@ CREATE TABLE [db.2].`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                 @"
 DROP TABLE [db.2].`Kilimanjaro`;
 
-DROP TABLE `dbo`.[K.2];
+DROP TABLE [K.2];
 
 DROP TABLE [db.2].[K.2];");
         }
@@ -225,12 +225,12 @@ DROP TABLE [db.2].[K.2];");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.[K.2] ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE [K.2] ( Id int, A varchar, UNIQUE (A ) );
 
 CREATE TABLE `db2`.[K.2] ( Id int, A varchar, UNIQUE (A ) );
 
-CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
-                new[] { "dbo.[K.2]" },
+CREATE TABLE `Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
+                new[] { "[K.2]" },
                 Enumerable.Empty<string>(),
                 dbModel =>
                 {
@@ -242,9 +242,9 @@ CREATE TABLE `dbo`.`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                     Assert.Empty(table.ForeignKeys);
                 },
                 @"
-DROP TABLE `dbo`.`Kilimanjaro`;
+DROP TABLE `Kilimanjaro`;
 
-DROP TABLE `dbo`.[K.2];
+DROP TABLE [K.2];
 
 DROP TABLE `db2`.[K.2];");
         }
@@ -254,7 +254,7 @@ DROP TABLE `db2`.[K.2];");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.`K2` ( Id int, A varchar, UNIQUE (A ) );
+CREATE TABLE `K2` ( Id int, A varchar, UNIQUE (A ) );
 
 CREATE TABLE [db.2].`K2` ( Id int, A varchar, UNIQUE (A ) );
 
@@ -273,7 +273,7 @@ CREATE TABLE [db.2].`Kilimanjaro` ( Id int, B varchar, UNIQUE (B) );",
                 @"
 DROP TABLE [db.2].`Kilimanjaro`;
 
-DROP TABLE `dbo`.`K2`;
+DROP TABLE `K2`;
 
 DROP TABLE [db.2].`K2`;");
         }
@@ -283,7 +283,7 @@ DROP TABLE [db.2].`K2`;");
         {
             Test(
                 @"
-CREATE SEQUENCE `dbo`.`Sequence`;
+CREATE SEQUENCE `Sequence`;
 CREATE SEQUENCE `db2`.`Sequence`;
 
 CREATE TABLE [db.2].`QuotedTableName` ( Id int PRIMARY KEY );
@@ -291,10 +291,10 @@ CREATE TABLE [db.2].[Table.With.Dot] ( Id int PRIMARY KEY );
 CREATE TABLE [db.2].`SimpleTableName` ( Id int PRIMARY KEY );
 CREATE TABLE [db.2].`JustTableName` ( Id int PRIMARY KEY );
 
-CREATE TABLE `dbo`.`QuotedTableName` ( Id int PRIMARY KEY );
-CREATE TABLE `dbo`.[Table.With.Dot] ( Id int PRIMARY KEY );
-CREATE TABLE `dbo`.`SimpleTableName` ( Id int PRIMARY KEY );
-CREATE TABLE `dbo`.`JustTableName` ( Id int PRIMARY KEY );
+CREATE TABLE `QuotedTableName` ( Id int PRIMARY KEY );
+CREATE TABLE [Table.With.Dot] ( Id int PRIMARY KEY );
+CREATE TABLE `SimpleTableName` ( Id int PRIMARY KEY );
+CREATE TABLE `JustTableName` ( Id int PRIMARY KEY );
 
 CREATE TABLE `db2`.`QuotedTableName` ( Id int PRIMARY KEY );
 CREATE TABLE `db2`.[Table.With.Dot] ( Id int PRIMARY KEY );
@@ -320,7 +320,7 @@ CREATE TABLE `db2`.`DependentTable` (
 );",
                 new[]
                 {
-                    "[db.2].`QuotedTableName`", "[db.2].SimpleTableName", "dbo.[Table.With.Dot]", "dbo.SimpleTableName", "JustTableName"
+                    "[db.2].`QuotedTableName`", "[db.2].SimpleTableName", "[Table.With.Dot]", "SimpleTableName", "JustTableName"
                 },
                 new[] { "db2" },
                 dbModel =>
@@ -355,7 +355,7 @@ CREATE TABLE `db2`.`DependentTable` (
                     Assert.Single(dependentTable.ForeignKeys);
                 },
                 @"
-DROP SEQUENCE `dbo`.`Sequence`;
+DROP SEQUENCE `Sequence`;
 DROP SEQUENCE `db2`.`Sequence`;
 
 DROP TABLE [db.2].`QuotedTableName`;
@@ -363,10 +363,10 @@ DROP TABLE [db.2].[Table.With.Dot];
 DROP TABLE [db.2].`SimpleTableName`;
 DROP TABLE [db.2].`JustTableName`;
 
-DROP TABLE `dbo`.`QuotedTableName`;
-DROP TABLE `dbo`.[Table.With.Dot];
-DROP TABLE `dbo`.`SimpleTableName`;
-DROP TABLE `dbo`.`JustTableName`;
+DROP TABLE `QuotedTableName`;
+DROP TABLE [Table.With.Dot];
+DROP TABLE `SimpleTableName`;
+DROP TABLE `JustTableName`;
 
 DROP TABLE `db2`.`QuotedTableName`;
 DROP TABLE `db2`.[Table.With.Dot];
@@ -385,7 +385,7 @@ DROP TABLE `db2`.`PrincipalTable`;");
         {
             Test(
                 @"
-CREATE TABLE `dbo`.`Blogs` (
+CREATE TABLE `Blogs` (
     Id int,
     Name nvarchar(100) NOT NULL,
 );
@@ -420,7 +420,7 @@ On multiple lines.", c.Table.Comment);
                     Assert.Single(table.Columns.Where(c => c.Comment == "Blog.Id column comment."));
                     Assert.Single(table.Columns.Where(c => c.Comment != null));
                 },
-                "DROP TABLE `dbo`.`Blogs`");
+                "DROP TABLE `Blogs`");
         }
 
         [ConditionalFact]
@@ -428,7 +428,7 @@ On multiple lines.", c.Table.Comment);
         {
             Test(
                 @"
-CREATE VIEW `dbo`.`BlogsView`
+CREATE VIEW `BlogsView`
  AS
 SELECT
  100 AS Id,
@@ -451,7 +451,7 @@ SELECT
                     Assert.Single(table.Columns.Where(c => c.Name == "Id"));
                     Assert.Single(table.Columns.Where(c => c.Name == "Name"));
                 },
-                "DROP VIEW `dbo`.`BlogsView`;");
+                "DROP VIEW `BlogsView`;");
         }
 
         [ConditionalFact]
@@ -602,14 +602,14 @@ DROP TABLE PrincipalTable;");
         {
             Fixture.TestStore.ExecuteNonQuery(
                 @"
-CREATE TYPE dbo.TestTypeAlias FROM nvarchar(max);
+CREATE TYPE TestTypeAlias FROM nvarchar(max);
 CREATE TYPE db2.TestTypeAlias FROM int;");
 
             Test(
                 @"
 CREATE TABLE TypeAlias (
     Id int,
-    typeAliasColumn dbo.TestTypeAlias NULL
+    typeAliasColumn TestTypeAlias NULL
 );",
                 Enumerable.Empty<string>(),
                 Enumerable.Empty<string>(),
@@ -622,7 +622,7 @@ CREATE TABLE TypeAlias (
                 },
                 @"
 DROP TABLE TypeAlias;
-DROP TYPE dbo.TestTypeAlias;
+DROP TYPE TestTypeAlias;
 DROP TYPE db2.TestTypeAlias;");
         }
 
@@ -1860,7 +1860,7 @@ CREATE TABLE DependentTable (
                     Assert.Equal(
                         JetResources.LogPrincipalTableNotInSelectionSet(new TestLogger<JetLoggingDefinitions>())
                             .GenerateMessage(
-                                "MYFK", "dbo.DependentTable", "dbo.PrincipalTable"), Message);
+                                "MYFK", "DependentTable", "PrincipalTable"), Message);
                 },
                 @"
 DROP TABLE DependentTable;
@@ -1885,7 +1885,7 @@ CREATE TABLE PrincipalTable (
                     Assert.Equal(LogLevel.Debug, level);
                     Assert.Equal(
                         JetResources.LogReflexiveConstraintIgnored(new TestLogger<JetLoggingDefinitions>())
-                            .GenerateMessage("MYFK", "dbo.PrincipalTable"), message);
+                            .GenerateMessage("MYFK", "PrincipalTable"), message);
 
                     var table = Assert.Single(dbModel.Tables);
                     Assert.Empty(table.ForeignKeys);