Review comments

Author: roji

Diff for: src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs

@@ -2822,7 +2822,7 @@ protected virtual ValuesExpression ApplyTypeMappingsOnValuesExpression(ValuesExp
             for (var i = 0; i < newRowValues.Length; i++)
             {
                 var rowValue = valuesExpression.RowValues[i];
-                var newValues = new SqlExpression[valuesExpression.ColumnNames.Count - (stripOrdering ? 1 : 0)];
+                var newValues = new SqlExpression[newColumnNames.Count];
                 for (var j = 0; j < valuesExpression.ColumnNames.Count; j++)
                 {
                     Check.DebugAssert(rowValue.Values[j] is SqlConstantExpression, "Non-constant SqlExpression in ValuesExpression");

Diff for: src/EFCore.SqlServer/Infrastructure/SqlServerDbContextOptionsBuilder.cs

@@ -114,7 +114,6 @@ public virtual SqlServerDbContextOptionsBuilder EnableRetryOnFailure(
     ///     documentation on compatibility level</see> for more information and examples.
     /// </remarks>
     /// <param name="compatibilityLevel"><see langword="false" /> to have null resource</param>
-    // TODO: Naming; Cosmos doesn't have Use/Set, so just CompatibilityLevel? SetCompatibilityLevel?
     public virtual SqlServerDbContextOptionsBuilder UseCompatibilityLevel(int compatibilityLevel)
         => WithOption(e => e.WithCompatibilityLevel(compatibilityLevel));
 }

Diff for: test/EFCore.Relational.Specification.Tests/Query/NonSharedPrimitiveCollectionsQueryRelationalTestBase.cs

@@ -27,6 +27,9 @@ public virtual async Task Column_collection_inside_json_owned_entity()
 
         var result = await context.Set<TestOwner>().SingleAsync(o => o.Owned.Strings.Count() == 2);
         Assert.Equivalent(new[] { "foo", "bar" }, result.Owned.Strings);
+
+        result = await context.Set<TestOwner>().SingleAsync(o => o.Owned.Strings[1] == "bar");
+        Assert.Equivalent(new[] { "foo", "bar" }, result.Owned.Strings);
     }
 
     protected class TestOwner

Diff for: test/EFCore.SqlServer.FunctionalTests/Query/NonSharedPrimitiveCollectionsQuerySqlServerTest.cs

@@ -265,6 +265,16 @@ FROM [TestOwner] AS [t]
 WHERE (
     SELECT COUNT(*)
     FROM OpenJson(JSON_VALUE([t].[Owned], '$.Strings')) AS [s]) = 2
+""",
+            //
+"""
+SELECT TOP(2) [t].[Id], [t].[Owned]
+FROM [TestOwner] AS [t]
+WHERE (
+    SELECT [s].[value]
+    FROM OpenJson(JSON_VALUE([t].[Owned], '$.Strings')) AS [s]
+    ORDER BY CAST([s].[key] AS int)
+    OFFSET 1 ROWS FETCH NEXT 1 ROWS ONLY) = N'bar'
 """);
     }
 

Diff for: test/EFCore.Sqlite.FunctionalTests/Query/NonSharedPrimitiveCollectionsQuerySqliteTest.cs

@@ -224,6 +224,17 @@ public override async Task Column_collection_inside_json_owned_entity()
 FROM "TestOwner" AS "t"
 WHERE json_array_length(json_extract("t"."Owned", '$.Strings')) = 2
 LIMIT 2
+""",
+            //
+"""
+SELECT "t"."Id", "t"."Owned"
+FROM "TestOwner" AS "t"
+WHERE (
+    SELECT "s"."value"
+    FROM json_each(json_extract("t"."Owned", '$.Strings')) AS "s"
+    ORDER BY "s"."key"
+    LIMIT 1 OFFSET 1) = 'bar'
+LIMIT 2
 """);
     }