Merge pull request #123 from microting/copilot/fix-tojson-issues

Add ToJson() configuration for complex collections in EF Core 10

Author: renemadsen

test/EFCore.MySql.FunctionalTests/ComplexCollectionJsonMySqlTest.cs

@@ -123,14 +123,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 entity.HasKey(e => e.Id);
 
-                // In EF Core 10, complex collections MUST use ToJson()
-                // This maps the collection to a JSON column in the database
-                // We use ComplexProperty to configure the Departments complex type collection
-                entity.ComplexProperty(e => e.Departments);
-                    //.ToJson();  // This should make it a JSON column - but the API might be different
-                
-                // Alternative: If ComplexProperty doesn't have ToJson(), we might need to use:
-                // entity.Property(e => e.Departments).ToJson();
+                // In EF Core 10, complex collections MUST be mapped to JSON columns
+                entity.ComplexCollection(e => e.Departments).ToJson();
             });
         }
     }

test/EFCore.MySql.FunctionalTests/ComplexTypesTrackingMySqlTest.cs

@@ -36,6 +36,51 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
+            // Complex collections must be mapped to JSON columns in EF Core 10+
+            modelBuilder.Entity<PubWithCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            modelBuilder.Entity<PubWithRecordCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            modelBuilder.Entity<PubWithArrayCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            modelBuilder.Entity<PubWithRecordArrayCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            modelBuilder.Entity<PubWithPropertyBagCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            // Field-based entities are only configured when not using proxies
+            // (proxies require virtual properties)
+            modelBuilder.Entity<FieldPubWithCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
+            modelBuilder.Entity<FieldPubWithRecordCollections>(b =>
+            {
+                b.ComplexCollection(
+                    e => e.Activities, b => b.ToJson());
+            });
+
             // modelBuilder.Entity<Pub>(
             //     b =>
             //     {

test/EFCore.MySql.FunctionalTests/PropertyValuesMySqlTest.cs

@@ -14,6 +14,14 @@ public PropertyValuesMySqlTest(PropertyValuesMySqlFixture fixture)
         public class PropertyValuesMySqlFixture : PropertyValuesFixtureBase
         {
             protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
+
+            protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
+            {
+                base.OnModelCreating(modelBuilder, context);
+
+                // Complex collections must be mapped to JSON columns in EF Core 10+
+                modelBuilder.Entity<School>(b => b.ComplexCollection(e => e.Departments, b => b.ToJson()));
+            }
         }
     }
 }