From a4e7fe3aa9a1ac163a6452b9dd7f92da1977fd48 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Sun, 16 Jun 2024 11:32:09 +0200 Subject: [PATCH] Update test baselines --- .../Query/GearsOfWarQuerySqlServerTest.cs | 10 +++++----- .../Query/NorthwindFunctionsQuerySqlServerTest.cs | 2 +- .../Query/NullSemanticsQuerySqlServerTest.cs | 7 ++----- .../Query/TPCGearsOfWarQuerySqlServerTest.cs | 10 +++++----- .../Query/TPTGearsOfWarQuerySqlServerTest.cs | 10 +++++----- .../Query/TemporalGearsOfWarQuerySqlServerTest.cs | 10 +++++----- .../Query/GearsOfWarQuerySqliteTest.cs | 8 ++++---- .../Query/NullSemanticsQuerySqliteTest.cs | 4 ++-- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 098b7169466..8f78fe9df9f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -1207,10 +1207,10 @@ public override async Task Select_null_propagation_negative9(bool async) AssertSql( """ SELECT CASE - WHEN [g].[LeaderNickname] IS NOT NULL THEN COALESCE(CASE + WHEN [g].[LeaderNickname] IS NOT NULL THEN CASE WHEN CAST(LEN([g].[Nickname]) AS int) = 5 THEN CAST(1 AS bit) ELSE CAST(0 AS bit) - END, CAST(0 AS bit)) + END ELSE NULL END FROM [Gears] AS [g] @@ -4025,7 +4025,7 @@ public override async Task ToString_enum_property_projection(bool async) await base.ToString_enum_property_projection(async); AssertSql( -""" + """ SELECT CASE [g].[Rank] WHEN 0 THEN N'None' WHEN 1 THEN N'Private' @@ -4036,7 +4036,7 @@ WHEN 16 THEN N'Captain' WHEN 32 THEN N'Major' WHEN 64 THEN N'Colonel' WHEN 128 THEN N'General' - ELSE COALESCE(CAST([g].[Rank] AS nvarchar(max)), N'') + ELSE CAST([g].[Rank] AS nvarchar(max)) END FROM [Gears] AS [g] """); @@ -5754,7 +5754,7 @@ SELECT COALESCE(( SELECT TOP(1) [w].[Id] FROM [Weapons] AS [w] WHERE [g].[FullName] = [w].[OwnerFullName] - ORDER BY [w].[Id]), 0, 42) + ORDER BY [w].[Id]), 0) FROM [Gears] AS [g] """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs index 8511b5b02e5..7d1e63f3124 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs @@ -420,7 +420,7 @@ public override async Task String_Join_non_aggregate(bool async) SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region] FROM [Customers] AS [c] -WHERE CONCAT_WS(N'|', [c].[CompanyName], COALESCE(@__foo_0, N''), N'', N'bar') = N'Around the Horn|foo||bar' +WHERE CONCAT_WS(N'|', [c].[CompanyName], @__foo_0, N'', N'bar') = N'Around the Horn|foo||bar' """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs index 9a384094286..56b0469aa6c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NullSemanticsQuerySqlServerTest.cs @@ -1070,10 +1070,7 @@ public override async Task Where_coalesce_shortcircuit(bool async) """ SELECT [e].[Id] FROM [Entities1] AS [e] -WHERE COALESCE(CASE - WHEN [e].[BoolA] = CAST(1 AS bit) OR [e].[BoolB] = CAST(1 AS bit) THEN CAST(1 AS bit) - ELSE CAST(0 AS bit) -END, [e].[NullableBoolA], CAST(1 AS bit)) = CAST(1 AS bit) +WHERE [e].[BoolA] = CAST(1 AS bit) OR [e].[BoolB] = CAST(1 AS bit) """); } @@ -1088,7 +1085,7 @@ FROM [Entities1] AS [e] WHERE COALESCE([e].[NullableBoolA], CASE WHEN [e].[BoolA] = CAST(1 AS bit) OR [e].[BoolB] = CAST(1 AS bit) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) -END, [e].[NullableBoolB], [e].[BoolB]) = CAST(1 AS bit) +END) = CAST(1 AS bit) """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs index bafb8cd54ca..0ffc3f2bcb5 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs @@ -1701,10 +1701,10 @@ public override async Task Select_null_propagation_negative9(bool async) AssertSql( """ SELECT CASE - WHEN [u].[LeaderNickname] IS NOT NULL THEN COALESCE(CASE + WHEN [u].[LeaderNickname] IS NOT NULL THEN CASE WHEN CAST(LEN([u].[Nickname]) AS int) = 5 THEN CAST(1 AS bit) ELSE CAST(0 AS bit) - END, CAST(0 AS bit)) + END ELSE NULL END FROM ( @@ -5406,7 +5406,7 @@ public override async Task ToString_enum_property_projection(bool async) await base.ToString_enum_property_projection(async); AssertSql( -""" + """ SELECT CASE [u].[Rank] WHEN 0 THEN N'None' WHEN 1 THEN N'Private' @@ -5417,7 +5417,7 @@ WHEN 16 THEN N'Captain' WHEN 32 THEN N'Major' WHEN 64 THEN N'Colonel' WHEN 128 THEN N'General' - ELSE COALESCE(CAST([u].[Rank] AS nvarchar(max)), N'') + ELSE CAST([u].[Rank] AS nvarchar(max)) END FROM ( SELECT [g].[Rank] @@ -7856,7 +7856,7 @@ SELECT COALESCE(( SELECT TOP(1) [w].[Id] FROM [Weapons] AS [w] WHERE [u].[FullName] = [w].[OwnerFullName] - ORDER BY [w].[Id]), 0, 42) + ORDER BY [w].[Id]), 0) FROM ( SELECT [g].[FullName] FROM [Gears] AS [g] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs index d906429c4fe..5a4f68d6767 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs @@ -1440,10 +1440,10 @@ public override async Task Select_null_propagation_negative9(bool async) AssertSql( """ SELECT CASE - WHEN [g].[LeaderNickname] IS NOT NULL THEN COALESCE(CASE + WHEN [g].[LeaderNickname] IS NOT NULL THEN CASE WHEN CAST(LEN([g].[Nickname]) AS int) = 5 THEN CAST(1 AS bit) ELSE CAST(0 AS bit) - END, CAST(0 AS bit)) + END ELSE NULL END FROM [Gears] AS [g] @@ -4683,7 +4683,7 @@ public override async Task ToString_enum_property_projection(bool async) await base.ToString_enum_property_projection(async); AssertSql( -""" + """ SELECT CASE [g].[Rank] WHEN 0 THEN N'None' WHEN 1 THEN N'Private' @@ -4694,7 +4694,7 @@ WHEN 16 THEN N'Captain' WHEN 32 THEN N'Major' WHEN 64 THEN N'Colonel' WHEN 128 THEN N'General' - ELSE COALESCE(CAST([g].[Rank] AS nvarchar(max)), N'') + ELSE CAST([g].[Rank] AS nvarchar(max)) END FROM [Gears] AS [g] """); @@ -6612,7 +6612,7 @@ SELECT COALESCE(( SELECT TOP(1) [w].[Id] FROM [Weapons] AS [w] WHERE [g].[FullName] = [w].[OwnerFullName] - ORDER BY [w].[Id]), 0, 42) + ORDER BY [w].[Id]), 0) FROM [Gears] AS [g] """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs index 7374c5a47ee..6d0de71d1fc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs @@ -851,7 +851,7 @@ SELECT COALESCE(( SELECT TOP(1) [w].[Id] FROM [Weapons] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [w] WHERE [g].[FullName] = [w].[OwnerFullName] - ORDER BY [w].[Id]), 0, 42) + ORDER BY [w].[Id]), 0) FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g] """); } @@ -2660,10 +2660,10 @@ public override async Task Select_null_propagation_negative9(bool async) AssertSql( """ SELECT CASE - WHEN [g].[LeaderNickname] IS NOT NULL THEN COALESCE(CASE + WHEN [g].[LeaderNickname] IS NOT NULL THEN CASE WHEN CAST(LEN([g].[Nickname]) AS int) = 5 THEN CAST(1 AS bit) ELSE CAST(0 AS bit) - END, CAST(0 AS bit)) + END ELSE NULL END FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g] @@ -4798,7 +4798,7 @@ public override async Task ToString_enum_property_projection(bool async) await base.ToString_enum_property_projection(async); AssertSql( -""" + """ SELECT CASE [g].[Rank] WHEN 0 THEN N'None' WHEN 1 THEN N'Private' @@ -4809,7 +4809,7 @@ WHEN 16 THEN N'Captain' WHEN 32 THEN N'Major' WHEN 64 THEN N'Colonel' WHEN 128 THEN N'General' - ELSE COALESCE(CAST([g].[Rank] AS nvarchar(max)), N'') + ELSE CAST([g].[Rank] AS nvarchar(max)) END FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g] """); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs index d1a14d2e820..e2da36db970 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs @@ -3312,7 +3312,7 @@ public override async Task Select_null_propagation_negative9(bool async) AssertSql( """ SELECT CASE - WHEN "g"."LeaderNickname" IS NOT NULL THEN COALESCE(length("g"."Nickname") = 5, 0) + WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."Nickname") = 5 ELSE NULL END FROM "Gears" AS "g" @@ -3440,7 +3440,7 @@ public override async Task ToString_enum_property_projection(bool async) await base.ToString_enum_property_projection(async); AssertSql( -""" + """ SELECT CASE "g"."Rank" WHEN 0 THEN 'None' WHEN 1 THEN 'Private' @@ -3451,7 +3451,7 @@ WHEN 16 THEN 'Captain' WHEN 32 THEN 'Major' WHEN 64 THEN 'Colonel' WHEN 128 THEN 'General' - ELSE COALESCE(CAST("g"."Rank" AS TEXT), '') + ELSE CAST("g"."Rank" AS TEXT) END FROM "Gears" AS "g" """); @@ -5629,7 +5629,7 @@ SELECT COALESCE(( FROM "Weapons" AS "w" WHERE "g"."FullName" = "w"."OwnerFullName" ORDER BY "w"."Id" - LIMIT 1), 0, 42) + LIMIT 1), 0) FROM "Gears" AS "g" """); } diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/NullSemanticsQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/NullSemanticsQuerySqliteTest.cs index fec3ceb9a12..f61b2150bdf 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/NullSemanticsQuerySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/NullSemanticsQuerySqliteTest.cs @@ -25,7 +25,7 @@ public override async Task Where_coalesce_shortcircuit(bool async) """ SELECT "e"."Id" FROM "Entities1" AS "e" -WHERE COALESCE("e"."BoolA" OR "e"."BoolB", "e"."NullableBoolA", 1) +WHERE "e"."BoolA" OR "e"."BoolB" """); } @@ -37,7 +37,7 @@ public override async Task Where_coalesce_shortcircuit_many(bool async) """ SELECT "e"."Id" FROM "Entities1" AS "e" -WHERE COALESCE("e"."NullableBoolA", "e"."BoolA" OR "e"."BoolB", "e"."NullableBoolB", "e"."BoolB") +WHERE COALESCE("e"."NullableBoolA", "e"."BoolA" OR "e"."BoolB") """); }