Fix tests for Azure SQL and SQL Server 2025 (#36631)

Part of #35884

Author: AndriySvyryd

test/EFCore.SqlServer.FunctionalTests/Query/AdHocJsonQuerySqlServerTestBase.cs

@@ -444,7 +444,7 @@ INSERT INTO [Entities] ([Id], [Scenario], [OptionalReference], [RequiredReferenc
 
     #region EnumLegacyValues
 
-    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
+    [ConditionalTheory(Skip = "#36626"), MemberData(nameof(IsAsyncData))]
     public virtual async Task Read_enum_property_with_legacy_values(bool async)
     {
         var contextFactory = await InitializeAsync<DbContext>(

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServer160Test.cs

@@ -4905,6 +4905,6 @@ protected override string StoreName
             => "ComplexNavigations160";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(b => b.UseCompatibilityLevel(160));
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(160);
     }
 }

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServer160Test.cs

@@ -8525,6 +8525,6 @@ protected override string StoreName
             => "ComplexNavigationsOwned160";
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(b => b.UseCompatibilityLevel(160));
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(160);
     }
 }

test/EFCore.SqlServer.FunctionalTests/Query/JsonQueryJsonTypeSqlServerTest.cs

@@ -1375,6 +1375,9 @@ private void AssertSql(params string[] expected)
     public class Fixture160 : NorthwindQuerySqlServerFixture<NoopModelCustomizer>
     {
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(b => b.UseCompatibilityLevel(160));
+        {
+            var options = base.AddOptions(builder);
+            return options.UseSqlServerCompatibilityLevel(160);
+        }
     }
 }

test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServer160Test.cs

@@ -225,6 +225,6 @@ protected override void ClearLog()
     public class Fixture160 : NorthwindQuerySqlServerFixture<NoopModelCustomizer>
     {
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(b => b.UseCompatibilityLevel(160));
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(160);
     }
 }

test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServer160Test.cs

@@ -254,16 +254,9 @@ protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-        {
-            builder = base.AddOptions(builder);
-
             // TODO: Figure out if there's a nice way to continue using the retrying strategy
-            var sqlServerOptionsBuilder = new SqlServerDbContextOptionsBuilder(builder);
-            sqlServerOptionsBuilder
-                .UseCompatibilityLevel(120)
-                .ExecutionStrategy(d => new NonRetryingExecutionStrategy(d));
-            return builder;
-        }
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(120)
+                .ConfigureSqlEngine(b => b.ExecutionStrategy(d => new NonRetryingExecutionStrategy(d)));
 
         public override PrecompiledQueryTestHelpers PrecompiledQueryTestHelpers
             => SqlServerPrecompiledQueryTestHelpers.Instance;

test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs

@@ -1542,6 +1542,6 @@ protected override ITestStoreFactory TestStoreFactory
 
         // Compatibility level 120 (SQL Server 2014) doesn't support OPENJSON
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(o => o.UseCompatibilityLevel(120));
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(120);
     }
 }

test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQueryOldSqlServerTest.cs

@@ -2261,7 +2261,7 @@ protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).UseSqlServer(b => b.UseCompatibilityLevel(160));
+            => base.AddOptions(builder).UseSqlServerCompatibilityLevel(160);
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {

test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs

@@ -90,7 +90,7 @@ public override async Task Parameter_collection_Count_with_column_predicate_with
 FROM [PrimitiveCollectionsEntity] AS [p]
 WHERE (
     SELECT COUNT(*)
-    FROM (VALUES (2), (999), (1000)) AS [i]([Value])
+    FROM (VALUES (CAST(2 AS int)), (999), (1000)) AS [i]([Value])
     WHERE [i].[Value] > [p].[Id]) = 2
 """);
     }
@@ -1130,7 +1130,7 @@ public override async Task Column_collection_index_int()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE CAST(JSON_VALUE([p].[Ints], '$[1]') AS int) = 10
+WHERE JSON_VALUE([p].[Ints], '$[1]' RETURNING int) = 10
 """);
     }
 
@@ -1142,7 +1142,7 @@ public override async Task Column_collection_index_string()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE JSON_VALUE([p].[Strings], '$[1]') = N'10'
+WHERE JSON_VALUE([p].[Strings], '$[1]' RETURNING nvarchar(max)) = N'10'
 """);
     }
 
@@ -1154,7 +1154,7 @@ public override async Task Column_collection_index_datetime()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE CAST(JSON_VALUE([p].[DateTimes], '$[1]') AS datetime2) = '2020-01-10T12:30:00.0000000Z'
+WHERE JSON_VALUE([p].[DateTimes], '$[1]' RETURNING datetime2) = '2020-01-10T12:30:00.0000000Z'
 """);
     }
 
@@ -1166,7 +1166,7 @@ public override async Task Column_collection_index_beyond_end()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE CAST(JSON_VALUE([p].[Ints], '$[999]') AS int) = 10
+WHERE JSON_VALUE([p].[Ints], '$[999]' RETURNING int) = 10
 """);
     }
 
@@ -1179,7 +1179,7 @@ public override async Task Nullable_reference_column_collection_index_equals_nul
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE JSON_VALUE([p].[NullableStrings], '$[2]') = [p].[NullableString] OR (JSON_VALUE([p].[NullableStrings], '$[2]') IS NULL AND [p].[NullableString] IS NULL)
+WHERE JSON_VALUE([p].[NullableStrings], '$[2]' RETURNING nvarchar(max)) = [p].[NullableString] OR (JSON_VALUE([p].[NullableStrings], '$[2]' RETURNING nvarchar(max)) IS NULL AND [p].[NullableString] IS NULL)
 """);
     }
 
@@ -1193,7 +1193,7 @@ public override async Task Non_nullable_reference_column_collection_index_equals
 FROM [PrimitiveCollectionsEntity] AS [p]
 WHERE EXISTS (
     SELECT 1
-    FROM OPENJSON([p].[Strings]) AS [s]) AND JSON_VALUE([p].[Strings], '$[1]') = [p].[NullableString]
+    FROM OPENJSON([p].[Strings]) AS [s]) AND JSON_VALUE([p].[Strings], '$[1]' RETURNING nvarchar(max)) = [p].[NullableString]
 """);
     }
 
@@ -1221,11 +1221,7 @@ public override async Task Inline_collection_index_Column_with_EF_Constant()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE (
-    SELECT [i].[Value]
-    FROM (VALUES (0, CAST(1 AS int)), (1, 2), (2, 3)) AS [i]([_ord], [Value])
-    ORDER BY [i].[_ord]
-    OFFSET [p].[Int] ROWS FETCH NEXT 1 ROWS ONLY) = 1
+WHERE CAST(JSON_VALUE(N'[1,2,3]', '$[' + CAST([p].[Int] AS nvarchar(max)) + ']') AS int) = 1
 """);
     }
 
@@ -1299,7 +1295,7 @@ public override async Task Column_collection_ElementAt()
             """
 SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
 FROM [PrimitiveCollectionsEntity] AS [p]
-WHERE CAST(JSON_VALUE([p].[Ints], '$[1]') AS int) = 10
+WHERE JSON_VALUE([p].[Ints], '$[1]' RETURNING int) = 10
 """);
     }
 
@@ -1827,7 +1823,7 @@ SELECT COUNT(*)
         SELECT [i1].[Value]
         FROM (
             SELECT [i].[Value]
-            FROM (VALUES (1, @ints1), (2, @ints2)) AS [i]([_ord], [Value])
+            FROM (VALUES (0, @ints1), (1, @ints2)) AS [i]([_ord], [Value])
             ORDER BY [i].[_ord]
             OFFSET 1 ROWS
         ) AS [i1]
@@ -1917,7 +1913,7 @@ FROM [PrimitiveCollectionsEntity] AS [p]
     SELECT COUNT(*)
     FROM (
         SELECT [i].[Value] AS [Value0]
-        FROM (VALUES (1, @ints1), (2, @ints2)) AS [i]([_ord], [Value])
+        FROM (VALUES (0, @ints1), (1, @ints2)) AS [i]([_ord], [Value])
         ORDER BY [i].[_ord]
         OFFSET 1 ROWS
     ) AS [i0]
@@ -2147,7 +2143,7 @@ public override async Task Project_primitive_collections_element()
 
         AssertSql(
             """
-SELECT CAST(JSON_VALUE([p].[Ints], '$[0]') AS int) AS [Indexer], CAST(JSON_VALUE([p].[DateTimes], '$[0]') AS datetime2) AS [EnumerableElementAt], JSON_VALUE([p].[Strings], '$[1]') AS [QueryableElementAt]
+SELECT JSON_VALUE([p].[Ints], '$[0]' RETURNING int) AS [Indexer], JSON_VALUE([p].[DateTimes], '$[0]' RETURNING datetime2) AS [EnumerableElementAt], JSON_VALUE([p].[Strings], '$[1]' RETURNING nvarchar(max)) AS [QueryableElementAt]
 FROM [PrimitiveCollectionsEntity] AS [p]
 WHERE [p].[Id] < 4
 ORDER BY [p].[Id]
@@ -2268,8 +2264,10 @@ protected override ITestStoreFactory TestStoreFactory
             => SqlServerTestStoreFactory.Instance;
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder)
-                .UseSqlServer(b => b.UseCompatibilityLevel(160));
+        {
+            var options = base.AddOptions(builder);
+            return options.UseSqlServerCompatibilityLevel(160);
+        }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
         {