Structural equality support for complex JSON

src/EFCore.SqlServer/Query/Internal/SqlServerJsonPostprocessor.cs

@@ -261,7 +261,7 @@ when _columnsToRewrite.TryGetValue((columnExpression.TableAlias, columnExpressio
                 // with OPENJSON.
                 return openJsonExpression.JsonExpression.TypeMapping
                     is SqlServerStringTypeMapping { StoreType: "json" }
-                    or SqlServerOwnedJsonTypeMapping { StoreType: "json" }
+                    or SqlServerStructuralJsonTypeMapping { StoreType: "json" }
                     ? openJsonExpression.Update(
                         new SqlUnaryExpression(
                             ExpressionType.Convert,

src/EFCore.SqlServer/Query/Internal/SqlServerQuerySqlGenerator.cs

@@ -522,7 +522,7 @@ protected override Expression VisitJsonScalar(JsonScalarExpression jsonScalarExp
             return jsonScalarExpression;
         }
 
-        if (jsonScalarExpression.TypeMapping is SqlServerOwnedJsonTypeMapping
+        if (jsonScalarExpression.TypeMapping is SqlServerStructuralJsonTypeMapping
             || jsonScalarExpression.TypeMapping?.ElementTypeMapping is not null)
         {
             Sql.Append("JSON_QUERY(");
@@ -541,7 +541,7 @@ protected override Expression VisitJsonScalar(JsonScalarExpression jsonScalarExp
         GenerateJsonPath(jsonScalarExpression.Path);
         Sql.Append(")");
 
-        if (jsonScalarExpression.TypeMapping is not SqlServerOwnedJsonTypeMapping and not StringTypeMapping)
+        if (jsonScalarExpression.TypeMapping is not SqlServerStructuralJsonTypeMapping and not StringTypeMapping)
         {
             Sql.Append(" AS ");
             Sql.Append(jsonScalarExpression.TypeMapping!.StoreType);

src/EFCore.SqlServer/Storage/Internal/SqlServerOwnedJsonTypeMapping.cs → src/EFCore.SqlServer/Storage/Internal/SqlServerStructuralJsonTypeMapping.cs

@@ -14,10 +14,10 @@ namespace Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
-public class SqlServerOwnedJsonTypeMapping : JsonTypeMapping
+public class SqlServerStructuralJsonTypeMapping : JsonTypeMapping
 {
     private static readonly MethodInfo CreateUtf8StreamMethod
-        = typeof(SqlServerOwnedJsonTypeMapping).GetMethod(nameof(CreateUtf8Stream), [typeof(string)])!;
+        = typeof(SqlServerStructuralJsonTypeMapping).GetMethod(nameof(CreateUtf8Stream), [typeof(string)])!;
 
     private static readonly MethodInfo GetStringMethod
         = typeof(DbDataReader).GetRuntimeMethod(nameof(DbDataReader.GetString), [typeof(int)])!;
@@ -28,23 +28,23 @@ private static readonly MethodInfo GetStringMethod
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public static SqlServerOwnedJsonTypeMapping Default { get; } = new("nvarchar(max)");
+    public static SqlServerStructuralJsonTypeMapping Default { get; } = new("nvarchar(max)");
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public static SqlServerOwnedJsonTypeMapping OwnedJsonTypeDefault { get; } = new("json");
+    public static SqlServerStructuralJsonTypeMapping JsonTypeDefault { get; } = new("json");
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public SqlServerOwnedJsonTypeMapping(string storeType)
+    public SqlServerStructuralJsonTypeMapping(string storeType)
         : base(storeType, typeof(JsonTypePlaceholder), System.Data.DbType.String)
     {
     }
@@ -84,7 +84,7 @@ public override Expression CustomizeDataReaderExpression(Expression expression)
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    protected SqlServerOwnedJsonTypeMapping(RelationalTypeMappingParameters parameters)
+    protected SqlServerStructuralJsonTypeMapping(RelationalTypeMappingParameters parameters)
         : base(parameters)
     {
     }
@@ -105,7 +105,7 @@ protected virtual string EscapeSqlLiteral(string literal)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateNonNullSqlLiteral(object value)
-        => $"'{EscapeSqlLiteral(JsonSerializer.Serialize(value))}'";
+        => $"'{EscapeSqlLiteral((string)value)}'";
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -114,7 +114,7 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
-        => new SqlServerOwnedJsonTypeMapping(parameters);
+        => new SqlServerStructuralJsonTypeMapping(parameters);
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs

@@ -244,8 +244,8 @@ public SqlServerTypeMappingSource(
         if (clrType == typeof(JsonTypePlaceholder))
         {
             return storeTypeName == "json"
-                ? SqlServerOwnedJsonTypeMapping.OwnedJsonTypeDefault
-                : SqlServerOwnedJsonTypeMapping.Default;
+                ? SqlServerStructuralJsonTypeMapping.JsonTypeDefault
+                : SqlServerStructuralJsonTypeMapping.Default;
         }
 
         if (storeTypeName != null)

src/EFCore.SqlServer/Update/Internal/SqlServerModificationCommand.cs

@@ -84,7 +84,7 @@ protected override void ProcessSinglePropertyJsonUpdate(ref ColumnModificationPa
             parameters = parameters with
             {
                 Value = value,
-                TypeMapping = parameters.TypeMapping is SqlServerOwnedJsonTypeMapping
+                TypeMapping = parameters.TypeMapping is SqlServerStructuralJsonTypeMapping
                     ? SqlServerStringTypeMapping.UnicodeDefault
                     : parameters.TypeMapping
             };

src/EFCore.Sqlite.Core/Storage/Internal/SqliteJsonTypeMapping.cs

@@ -84,7 +84,7 @@ public override Expression CustomizeDataReaderExpression(Expression expression)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override string GenerateNonNullSqlLiteral(object value)
-        => $"'{EscapeSqlLiteral(JsonSerializer.Serialize(value))}'";
+        => $"'{EscapeSqlLiteral((string)value)}'";
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/ChangeTracking/Internal/InternalEntryBase.cs

@@ -1013,7 +1013,7 @@ private void ReorderOriginalComplexCollectionEntries(IComplexProperty complexPro
 
         var originalEntries = GetComplexCollectionOriginalEntries(complexProperty);
         var elementToOriginalEntry = new Dictionary<object, InternalComplexEntry>(ReferenceEqualityComparer.Instance);
-        
+
         // Build mapping of existing non-null elements to their entries
         for (var i = 0; i < originalEntries.Count && i < oldOriginalCollection.Count; i++)
         {

test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs

@@ -41,7 +41,7 @@ FROM root c
 WHERE ((
     SELECT VALUE COUNT(1)
     FROM r IN c["RelatedCollection"]
-    WHERE (r["Int"] != 50)) = 2)
+    WHERE (r["Int"] != 8)) = 2)
 """);
             });
 
@@ -59,7 +59,7 @@ FROM root c
 WHERE (ARRAY(
     SELECT VALUE r["Int"]
     FROM r IN c["RelatedCollection"]
-    ORDER BY r["Id"])[0] = 21)
+    ORDER BY r["Id"])[0] = 8)
 """);
         }
     }
@@ -74,7 +74,7 @@ public override Task Index_constant(bool async)
                     """
 SELECT VALUE c
 FROM root c
-WHERE (c["RelatedCollection"][0]["Int"] = 21)
+WHERE (c["RelatedCollection"][0]["Int"] = 8)
 """);
             });
 
@@ -90,7 +90,7 @@ public override Task Index_parameter(bool async)
 
 SELECT VALUE c
 FROM root c
-WHERE (c["RelatedCollection"][@i]["Int"] = 21)
+WHERE (c["RelatedCollection"][@i]["Int"] = 8)
 """);
             });
 
@@ -105,7 +105,7 @@ public override async Task Index_column(bool async)
                 """
 SELECT VALUE c
 FROM root c
-WHERE (c["RelatedCollection"][(c["Id"] - 1)]["Int"] = 21)
+WHERE (c["RelatedCollection"][(c["Id"] - 1)]["Int"] = 8)
 """);
         }
     }
@@ -120,7 +120,7 @@ public override async Task Index_out_of_bounds(bool async)
                 """
 SELECT VALUE c
 FROM root c
-WHERE (c["RelatedCollection"][9999]["Int"] = 50)
+WHERE (c["RelatedCollection"][9999]["Int"] = 8)
 """);
         }
     }

test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs

@@ -36,7 +36,7 @@ public override Task Where_optional_related_property(bool async)
                     """
 SELECT VALUE c
 FROM root c
-WHERE (c["OptionalRelated"]["Int"] = 9)
+WHERE (c["OptionalRelated"]["Int"] = 8)
 """);
             });
 
@@ -50,7 +50,7 @@ public override Task Where_nested_related_property(bool async)
                     """
 SELECT VALUE c
 FROM root c
-WHERE (c["RequiredRelated"]["RequiredNested"]["Int"] = 50)
+WHERE (c["RequiredRelated"]["RequiredNested"]["Int"] = 8)
 """);
             });