.Net 10

Author: phongnguyend

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/JsonComplexTypeOrder.cs

@@ -0,0 +1,8 @@
+namespace EntityFrameworkCore.SqlServer.SimpleBulks.Tests.Database;
+
+public class JsonComplexTypeOrder
+{
+    public int Id { get; set; }
+
+    public ComplexTypeAddress ShippingAddress { get; set; }
+}

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/Database/TestDbContext.cs

@@ -21,6 +21,8 @@ public class TestDbContext : DbContext
 
     public DbSet<ComplexOwnedTypeOrder> ComplexOwnedTypeOrders { get; set; }
 
+    public DbSet<JsonComplexTypeOrder> JsonComplexTypeOrders { get; set; }
+
     public DbSet<Blog> Blogs { get; set; }
 
     public DbSet<RssBlog> RssBlogs { get; set; }
@@ -59,9 +61,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         modelBuilder.Entity<Contact>().Property(x => x.Id).HasDefaultValueSql("newsequentialid()");
 
-        modelBuilder.Entity<ComplexTypeOrder>().ComplexProperty(x => x.ShippingAddress, x =>
+        modelBuilder.Entity<JsonComplexTypeOrder>().ComplexProperty(x => x.ShippingAddress, x =>
         {
-            x.ToJson("xxx").HasColumnType("json");
+            x.ToJson();
+            //x.ToJson("xxx").HasColumnType("json");
+            //x.ComplexProperty(y => y.Location, y =>
+            //{
+            //    y.ToJson();
+            //    //y.ToJson("xxx").HasColumnType("json");
+            //});
         });
 
         base.OnModelCreating(modelBuilder);

src/EntityFrameworkCore.SqlServer.SimpleBulks.Tests/DbContextExtensions/GetPropertiesTests.cs

@@ -251,4 +251,36 @@ public void GetProperties_ComplexOwnedType_ReturnsCorrectColumnInformation()
         Assert.False(property.IsPrimaryKey);
         Assert.False(property.IsRowVersion);
     }
+
+    [Fact]
+    public void GetProperties_JsonComplexType_ReturnsCorrectColumnInformation()
+    {
+        // Arrange
+        var dbContext = new TestDbContext("", "");
+
+        // Act
+        var properties = dbContext.GetProperties(typeof(JsonComplexTypeOrder));
+
+        // Assert
+        Assert.Equal(2, properties.Count);
+
+        var property = properties.First(p => p.PropertyName == "Id");
+        Assert.Equal(typeof(int), property.PropertyType);
+        Assert.Equal("Id", property.ColumnName);
+        Assert.Equal("int", property.ColumnType);
+        Assert.Equal(ValueGenerated.OnAdd, property.ValueGenerated);
+        Assert.Null(property.DefaultValueSql);
+        Assert.True(property.IsPrimaryKey);
+        Assert.False(property.IsRowVersion);
+
+        property = properties.First(p => p.PropertyName == "ShippingAddress");
+        Assert.Equal(typeof(ComplexTypeAddress), property.PropertyType);
+        Assert.Equal("ShippingAddress", property.ColumnName);
+        Assert.Equal("nvarchar(max)", property.ColumnType);
+        Assert.Equal(ValueGenerated.Never, property.ValueGenerated);
+        Assert.Null(property.DefaultValueSql);
+        Assert.False(property.IsPrimaryKey);
+        Assert.False(property.IsRowVersion);
+        Assert.True(property.IsJson);
+    }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks/ColumnInfor.cs

@@ -22,4 +22,6 @@ public class ColumnInfor
     public bool IsRowVersion { get; init; }
 
     public ValueConverter? ValueConverter { get; set; }
+
+    public bool IsJson { get; set; }
 }

src/EntityFrameworkCore.SqlServer.SimpleBulks/Extensions/DbContextExtensions.cs

@@ -183,7 +183,7 @@ private static List<ColumnInfor> GetColumnInfos(Type type, IEnumerable<IProperty
     private static void AddJsonComplexProperty(List<ColumnInfor> columnInfors, IComplexProperty complexProperty, StoreObjectIdentifier storeObjectIdentifier)
     {
         var containerColumnName = complexProperty.ComplexType.GetContainerColumnName();
-        var containerColumnType = complexProperty.ComplexType.GetContainerColumnType();
+        var containerColumnType = complexProperty.ComplexType.GetContainerColumnType() ?? "nvarchar(max)";
 
         columnInfors.Add(new ColumnInfor
         {
@@ -196,6 +196,7 @@ private static void AddJsonComplexProperty(List<ColumnInfor> columnInfors, IComp
             IsPrimaryKey = false,
             IsRowVersion = false,
             ValueConverter = null,
+            IsJson = true
         });
     }
 
@@ -209,7 +210,15 @@ private static void AddComplexProperty(List<ColumnInfor> columnInfors, IComplexP
 
         foreach (var nestedComplexProperty in nestedComplexProperties)
         {
-            AddComplexProperty(columnInfors, nestedComplexProperty, storeObjectIdentifier, prefix + nestedComplexProperty.Name + ".");
+            if (complexProperty.ComplexType.IsMappedToJson())
+            {
+                // For JSON-mapped complex types, add the complex property itself as a single JSON column
+                AddJsonComplexProperty(columnInfors, nestedComplexProperty, storeObjectIdentifier);
+            }
+            else
+            {
+                AddComplexProperty(columnInfors, nestedComplexProperty, storeObjectIdentifier, prefix + nestedComplexProperty.Name + ".");
+            }
         }
     }