From b80c0c8128842d86fd64e362d7450fbdbd3e1083 Mon Sep 17 00:00:00 2001 From: Christopher Jolly Date: Wed, 9 Nov 2022 23:56:52 +0800 Subject: [PATCH] Update tests --- .../Internal/JetAnnotationProvider.cs | 2 +- .../EFCore.Jet.FunctionalTests/FindJetTest.cs | 12 +- .../Query/ComplexNavigationsQueryJetTest.cs | 2 +- .../Query/InheritanceQueryJetTest.cs | 109 ++++++------------ 4 files changed, 42 insertions(+), 83 deletions(-) diff --git a/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs b/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs index c761035..f49fedb 100644 --- a/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs +++ b/src/EFCore.Jet/Metadata/Internal/JetAnnotationProvider.cs @@ -73,7 +73,7 @@ namespace EntityFrameworkCore.Jet.Metadata.Internal var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema); var property = column.PropertyMappings.Where( m => - (m.TableMapping.IsSharedTablePrincipal.GetValueOrDefault(false)) && m.TableMapping.EntityType == m.Property.DeclaringEntityType) + (m.TableMapping.IsSharedTablePrincipal ?? true) && m.TableMapping.EntityType == m.Property.DeclaringEntityType) .Select(m => m.Property) .FirstOrDefault( p => p.GetValueGenerationStrategy(table) diff --git a/test/EFCore.Jet.FunctionalTests/FindJetTest.cs b/test/EFCore.Jet.FunctionalTests/FindJetTest.cs index 2d94ff1..e158cc9 100644 --- a/test/EFCore.Jet.FunctionalTests/FindJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/FindJetTest.cs @@ -156,7 +156,7 @@ WHERE `s`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); SELECT TOP 1 `c`.`Id1`, `c`.`Id2`, `c`.`Foo` FROM `CompositeKey` AS `c` -WHERE (`c`.`Id1` = {AssertSqlHelper.Parameter("@__p_0")}) AND (`c`.`Id2` = {AssertSqlHelper.Parameter("@__p_1")})"); +WHERE `c`.`Id1` = {AssertSqlHelper.Parameter("@__p_0")} AND `c`.`Id2` = {AssertSqlHelper.Parameter("@__p_1")}"); } public override void Returns_null_for_composite_key_not_in_store() @@ -169,7 +169,7 @@ WHERE (`c`.`Id1` = {AssertSqlHelper.Parameter("@__p_0")}) AND (`c`.`Id2` = {Asse SELECT TOP 1 `c`.`Id1`, `c`.`Id2`, `c`.`Foo` FROM `CompositeKey` AS `c` -WHERE (`c`.`Id1` = {AssertSqlHelper.Parameter("@__p_0")}) AND (`c`.`Id2` = {AssertSqlHelper.Parameter("@__p_1")})"); +WHERE `c`.`Id1` = {AssertSqlHelper.Parameter("@__p_0")} AND `c`.`Id2` = {AssertSqlHelper.Parameter("@__p_1")}"); } public override void Find_base_type_tracked() @@ -237,7 +237,7 @@ WHERE `b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); SELECT TOP 1 `b`.`Id`, `b`.`Discriminator`, `b`.`Foo`, `b`.`Boo` FROM `BaseType` AS `b` -WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")})"); +WHERE `b`.`Discriminator` = 'DerivedType' AND `b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); } public override void Returns_null_for_derived_type_not_in_store() @@ -249,7 +249,7 @@ WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Par SELECT TOP 1 `b`.`Id`, `b`.`Discriminator`, `b`.`Foo`, `b`.`Boo` FROM `BaseType` AS `b` -WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")})"); +WHERE `b`.`Discriminator` = 'DerivedType' AND `b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); } public override void Find_base_type_using_derived_set_tracked() @@ -261,7 +261,7 @@ WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Par SELECT TOP 1 `b`.`Id`, `b`.`Discriminator`, `b`.`Foo`, `b`.`Boo` FROM `BaseType` AS `b` -WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")})"); +WHERE `b`.`Discriminator` = 'DerivedType' AND `b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); } public override void Find_base_type_using_derived_set_from_store() @@ -273,7 +273,7 @@ WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Par SELECT TOP 1 `b`.`Id`, `b`.`Discriminator`, `b`.`Foo`, `b`.`Boo` FROM `BaseType` AS `b` -WHERE (`b`.`Discriminator` = 'DerivedType') AND (`b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")})"); +WHERE `b`.`Discriminator` = 'DerivedType' AND `b`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}"); } public override void Find_derived_type_using_base_set_tracked() diff --git a/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs index f3e0739..2598fe2 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs @@ -2629,7 +2629,7 @@ WHERE `l0`.`Id` IS NOT NULL"); @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id` FROM `LevelOne` AS `l` LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id` -WHERE `l0`.`Name` NOT IN ('Name1', 'Name2') OR (`l0`.`Name` IS NULL)"); +WHERE `l0`.`Name` NOT IN ('Name1', 'Name2') OR `l0`.`Name` IS NULL"); } public override async Task Include1(bool isAsync) diff --git a/test/EFCore.Jet.FunctionalTests/Query/InheritanceQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/InheritanceQueryJetTest.cs index c3448ac..8354148 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/InheritanceQueryJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/InheritanceQueryJetTest.cs @@ -50,15 +50,15 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query await base.Can_query_when_shared_column(async); AssertSql( - $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`CaffeineGrams`, `d`.`CokeCO2`, `d`.`SugarGrams` + $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`SortIndex`, `d`.`CaffeineGrams`, `d`.`CokeCO2`, `d`.`SugarGrams` FROM `Drinks` AS `d` WHERE `d`.`Discriminator` = 'Coke'", // - $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`LiltCO2`, `d`.`SugarGrams` + $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`SortIndex`, `d`.`LiltCO2`, `d`.`SugarGrams` FROM `Drinks` AS `d` WHERE `d`.`Discriminator` = 'Lilt'", // - $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`CaffeineGrams`, `d`.`HasMilk` + $@"SELECT TOP 2 `d`.`Id`, `d`.`Discriminator`, `d`.`SortIndex`, `d`.`CaffeineGrams`, `d`.`HasMilk` FROM `Drinks` AS `d` WHERE `d`.`Discriminator` = 'Tea'"); } @@ -76,7 +76,7 @@ WHERE `d`.`Discriminator` = 'Tea'"); base.FromSql_on_derived(); AssertSql( - @"SELECT `m`.`Species`, `m`.`CountryId`, `m`.`Discriminator`, `m`.`Name`, `m`.`EagleId`, `m`.`IsFlightless`, `m`.`Group` + @"SELECT `m`.`Id`, `m`.`CountryId`, `m`.`Discriminator`, `m`.`Name`, `m`.`Species`, `m`.`EagleId`, `m`.`IsFlightless`, `m`.`Group` FROM ( select * from ""Animals"" ) AS `m` @@ -88,7 +88,7 @@ WHERE `m`.`Discriminator` = 'Eagle'"); await base.Can_query_all_types_when_shared_column(async); AssertSql( - @"SELECT `d`.`Id`, `d`.`Discriminator`, `d`.`CaffeineGrams`, `d`.`CokeCO2`, `d`.`SugarGrams`, `d`.`LiltCO2`, `d`.`HasMilk` + @"SELECT `d`.`Id`, `d`.`Discriminator`, `d`.`SortIndex`, `d`.`CaffeineGrams`, `d`.`CokeCO2`, `d`.`SugarGrams`, `d`.`LiltCO2`, `d`.`HasMilk` FROM `Drinks` AS `d`"); } @@ -97,7 +97,7 @@ FROM `Drinks` AS `d`"); await base.Can_use_of_type_animal(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species`"); } @@ -107,7 +107,7 @@ ORDER BY `a`.`Species`"); await base.Can_use_is_kiwi(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Kiwi'"); } @@ -126,9 +126,9 @@ FROM `Animals` AS `a`"); await base.Can_use_is_kiwi_with_other_predicate(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`CountryId` = 1)"); +WHERE `a`.`Discriminator` = 'Kiwi' AND `a`.`CountryId` = 1"); } public override async Task Can_use_is_kiwi_in_projection(bool async) @@ -145,7 +145,7 @@ FROM `Animals` AS `a`"); await base.Can_use_of_type_bird(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species`"); } @@ -155,7 +155,7 @@ ORDER BY `a`.`Species`"); await base.Can_use_of_type_bird_predicate(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`CountryId` = 1 ORDER BY `a`.`Species`"); @@ -175,7 +175,7 @@ FROM `Animals` AS `a`"); await base.Can_use_of_type_bird_first(async); AssertSql( - @"SELECT TOP 1 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT TOP 1 `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species`"); } @@ -185,7 +185,7 @@ ORDER BY `a`.`Species`"); await base.Can_use_of_type_kiwi(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Kiwi'"); } @@ -205,7 +205,7 @@ WHERE `p`.`Genus` = 0"); await base.Can_query_all_animals(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species`"); } @@ -237,7 +237,7 @@ ORDER BY `p`.`Species`"); await base.Can_filter_all_animals(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Name` = 'Great spotted kiwi' ORDER BY `a`.`Species`"); @@ -248,7 +248,7 @@ ORDER BY `a`.`Species`"); await base.Can_query_all_birds(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species`"); } @@ -258,7 +258,7 @@ ORDER BY `a`.`Species`"); await base.Can_query_just_kiwis(async); AssertSql( - @"SELECT TOP 2 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT TOP 2 `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Kiwi'"); } @@ -279,14 +279,14 @@ WHERE `p`.`Genus` = 0" await base.Can_include_prey(async); AssertSql( - @"SELECT `t`.`Species`, `t`.`CountryId`, `t`.`Discriminator`, `t`.`Name`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `a0`.`Species`, `a0`.`CountryId`, `a0`.`Discriminator`, `a0`.`Name`, `a0`.`EagleId`, `a0`.`IsFlightless`, `a0`.`Group`, `a0`.`FoundOn` + @"SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Discriminator`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `a0`.`Id`, `a0`.`CountryId`, `a0`.`Discriminator`, `a0`.`Name`, `a0`.`Species`, `a0`.`EagleId`, `a0`.`IsFlightless`, `a0`.`Group`, `a0`.`FoundOn` FROM ( - SELECT TOP 2 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group` + SELECT TOP 2 `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Eagle' ) AS `t` -LEFT JOIN `Animals` AS `a0` ON `t`.`Species` = `a0`.`EagleId` -ORDER BY `t`.`Species`"); +LEFT JOIN `Animals` AS `a0` ON `t`.`Id` = `a0`.`EagleId` +ORDER BY `t`.`Id`"); } public override async Task Can_include_animals(bool async) @@ -294,7 +294,7 @@ ORDER BY `t`.`Species`"); await base.Can_include_animals(async); AssertSql( - @"SELECT `c`.`Id`, `c`.`Name`, `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `c`.`Id`, `c`.`Name`, `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Countries` AS `c` LEFT JOIN `Animals` AS `a` ON `c`.`Id` = `a`.`CountryId` ORDER BY `c`.`Name`, `c`.`Id`"); @@ -305,9 +305,9 @@ ORDER BY `c`.`Name`, `c`.`Id`"); await base.Can_use_of_type_kiwi_where_north_on_derived_property(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`FoundOn` = 0)"); +WHERE `a`.`Discriminator` = 'Kiwi' AND `a`.`FoundOn` = 0"); } public override async Task Can_use_of_type_kiwi_where_south_on_derived_property(bool async) @@ -315,9 +315,9 @@ WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`FoundOn` = 0)"); await base.Can_use_of_type_kiwi_where_south_on_derived_property(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`FoundOn` = 1)"); +WHERE `a`.`Discriminator` = 'Kiwi' AND `a`.`FoundOn` = 1"); } public override async Task Discriminator_used_when_projection_over_derived_type(bool async) @@ -352,47 +352,6 @@ WHERE `a`.`Discriminator` = 'Kiwi'"); public override void Can_insert_update_delete() { base.Can_insert_update_delete(); - - AssertSql( - $@"SELECT TOP 2 `c`.`Id`, `c`.`Name` -FROM `Countries` AS `c` -WHERE `c`.`Id` = 1", - // - $@"{AssertSqlHelper.Declaration("@p0='Apteryx owenii' (Nullable = false) (Size = 100)")} -{AssertSqlHelper.Declaration("@p1='1'")} -{AssertSqlHelper.Declaration("@p2='Kiwi' (Nullable = false) (Size = 255)")} -{AssertSqlHelper.Declaration("@p3=NULL (Size = 100)")} -{AssertSqlHelper.Declaration("@p4='0' (Nullable = true) (Size = 1)")} -{AssertSqlHelper.Declaration("@p5='True' (Nullable = true)")} -{AssertSqlHelper.Declaration("@p6='Little spotted kiwi' (Size = 255)")} - -INSERT INTO `Animals` (`Species`, `CountryId`, `Discriminator`, `EagleId`, `FoundOn`, `IsFlightless`, `Name`) -VALUES ({AssertSqlHelper.Parameter("@p0")}, {AssertSqlHelper.Parameter("@p1")}, {AssertSqlHelper.Parameter("@p2")}, {AssertSqlHelper.Parameter("@p3")}, {AssertSqlHelper.Parameter("@p4")}, {AssertSqlHelper.Parameter("@p5")}, {AssertSqlHelper.Parameter("@p6")});", - // - $@"SELECT TOP 2 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` -FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`Species` LIKE '%' & 'owenii')", -// - $@"{ AssertSqlHelper.Declaration("@p0='Aquila chrysaetos canadensis' (Size = 100)")} -{AssertSqlHelper.Declaration("@p1='Apteryx owenii' (Nullable = false) (Size = 100)")} - -UPDATE `Animals` SET `EagleId` = {AssertSqlHelper.Parameter("@p0")} -WHERE `Species` = {AssertSqlHelper.Parameter("@p1")}; -SELECT @@ROWCOUNT;", - // - $@"SELECT TOP 2 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` -FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`Species` LIKE '%' & 'owenii')", - // - $@"{AssertSqlHelper.Declaration("@p0='Apteryx owenii' (Nullable = false) (Size = 100)")} - -DELETE FROM `Animals` -WHERE `Species` = {AssertSqlHelper.Parameter("@p0")}; -SELECT @@ROWCOUNT;", - // - $@"SELECT COUNT(*) -FROM `Animals` AS `a` -WHERE (`a`.`Discriminator` = 'Kiwi') AND (`a`.`Species` LIKE '%' & 'owenii')"); } public override async Task Byte_enum_value_constant_used_in_projection(bool async) @@ -453,9 +412,9 @@ WHERE (`t`.`FoundOn` = CAST(0 AS tinyint)) AND `t`.`FoundOn` IS NOT NULL"); await base.Subquery_OfType(async); AssertSql( - $@"SELECT DISTINCT `t`.`Species`, `t`.`CountryId`, `t`.`Discriminator`, `t`.`Name`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`FoundOn` + $@"SELECT DISTINCT `t`.`Id`, `t`.`CountryId`, `t`.`Discriminator`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`FoundOn` FROM ( - SELECT TOP 5 `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + SELECT TOP 5 `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` ORDER BY `a`.`Species` ) AS `t` @@ -496,7 +455,7 @@ ORDER BY `a`.`Name`"); base.Casting_to_base_type_joining_with_query_type_works(); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `m`.`CountryId`, `m`.`Discriminator`, `m`.`Name`, `m`.`EagleId`, `m`.`IsFlightless`, `m`.`Group`, `m`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `m`.`CountryId`, `m`.`Discriminator`, `m`.`Name`, `m`.`EagleId`, `m`.`IsFlightless`, `m`.`Group`, `m`.`FoundOn` FROM `Animals` AS `a` INNER JOIN ( Select * from ""Animals"" @@ -509,12 +468,12 @@ WHERE `a`.`Discriminator` = 'Eagle'"); await base.Is_operator_on_result_of_FirstOrDefault(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`Group`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE ( - SELECT TOP 1 `a0`.`Discriminator` + SELECT TOP(1) `a0`.`Discriminator` FROM `Animals` AS `a0` - WHERE `a0`.`Name` = N'Great spotted kiwi') = 'Kiwi' + WHERE `a0`.`Name` = 'Great spotted kiwi') = 'Kiwi' ORDER BY `a`.`Species`"); } @@ -541,7 +500,7 @@ FROM `Animals` AS `a`"); await base.Can_use_backwards_of_type_animal(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Kiwi'"); } @@ -551,7 +510,7 @@ WHERE `a`.`Discriminator` = 'Kiwi'"); await base.Can_use_backwards_is_animal(async); AssertSql( - @"SELECT `a`.`Species`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` + @"SELECT `a`.`Id`, `a`.`CountryId`, `a`.`Discriminator`, `a`.`Name`, `a`.`Species`, `a`.`EagleId`, `a`.`IsFlightless`, `a`.`FoundOn` FROM `Animals` AS `a` WHERE `a`.`Discriminator` = 'Kiwi'"); }