Add HasCharSet method for ComplexPropertyBuilder, ComplexTypePropertyBuilder

Author: trejjam

src/EFCore.MySql/Extensions/MySqlPropertyBuilderExtensions.cs

@@ -149,6 +149,42 @@ public static PropertyBuilder HasCharSet(
             return propertyBuilder;
         }
 
+        /// <summary>
+        /// Configures the charset for the property's column.
+        /// </summary>
+        /// <param name="propertyBuilder">The builder for the property being configured.</param>
+        /// <param name="charSet">The name of the charset to configure for the property's column.</param>
+        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
+        public static ComplexPropertyBuilder HasCharSet(
+            [NotNull] this ComplexPropertyBuilder propertyBuilder,
+            string charSet)
+        {
+            Check.NotNull(propertyBuilder, nameof(propertyBuilder));
+
+            var property = propertyBuilder.Metadata;
+            property.SetCharSet(charSet);
+
+            return propertyBuilder;
+        }
+
+        /// <summary>
+        /// Configures the charset for the property's column.
+        /// </summary>
+        /// <param name="propertyBuilder">The builder for the property being configured.</param>
+        /// <param name="charSet">The name of the charset to configure for the property's column.</param>
+        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
+        public static ComplexTypePropertyBuilder HasCharSet(
+            [NotNull] this ComplexTypePropertyBuilder propertyBuilder,
+            string charSet)
+        {
+            Check.NotNull(propertyBuilder, nameof(propertyBuilder));
+
+            var property = propertyBuilder.Metadata;
+            property.SetCharSet(charSet);
+
+            return propertyBuilder;
+        }
+
         /// <summary>
         /// Configures the charset for the property's column.
         /// </summary>
@@ -160,6 +196,28 @@ public static PropertyBuilder<TProperty> HasCharSet<TProperty>(
             string charSet)
             => (PropertyBuilder<TProperty>)HasCharSet((PropertyBuilder)propertyBuilder, charSet);
 
+        /// <summary>
+        /// Configures the charset for the property's column.
+        /// </summary>
+        /// <param name="propertyBuilder">The builder for the property being configured.</param>
+        /// <param name="charSet">The name of the charset to configure for the property's column.</param>
+        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
+        public static ComplexPropertyBuilder<TProperty> HasCharSet<TProperty>(
+            [NotNull] this ComplexPropertyBuilder<TProperty> propertyBuilder,
+            string charSet)
+            => (ComplexPropertyBuilder<TProperty>)HasCharSet((ComplexPropertyBuilder)propertyBuilder, charSet);
+
+        /// <summary>
+        /// Configures the charset for the property's column.
+        /// </summary>
+        /// <param name="propertyBuilder">The builder for the property being configured.</param>
+        /// <param name="charSet">The name of the charset to configure for the property's column.</param>
+        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
+        public static ComplexTypePropertyBuilder<TProperty> HasCharSet<TProperty>(
+            [NotNull] this ComplexTypePropertyBuilder<TProperty> propertyBuilder,
+            string charSet)
+            => (ComplexTypePropertyBuilder<TProperty>)HasCharSet((ComplexTypePropertyBuilder)propertyBuilder, charSet);
+
         /// <summary>
         /// Configures the charset for the property's column.
         /// </summary>

src/EFCore.MySql/Extensions/MySqlPropertyExtensions.cs

@@ -548,6 +548,14 @@ internal static string GetMySqlLegacyCharSet([NotNull] this IReadOnlyProperty pr
         public static void SetCharSet([NotNull] this IMutableProperty property, string charSet)
             => property.SetOrRemoveAnnotation(MySqlAnnotationNames.CharSet, charSet);
 
+        /// <summary>
+        /// Sets the name of the charset in use by the column of the property.
+        /// </summary>
+        /// <param name="property">The property to set the columns charset for.</param>
+        /// <param name="charSet">The name of the charset used for the column of the property.</param>
+        public static void SetCharSet([NotNull] this IMutableComplexProperty property, string charSet)
+            => property.SetOrRemoveAnnotation(MySqlAnnotationNames.CharSet, charSet);
+
         /// <summary>
         /// Sets the name of the charset in use by the column of the property.
         /// </summary>

test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -1229,17 +1230,24 @@ await Test(
                             e.Property<string>("Name");
                             e.Property<string>("Brand")
                                 .HasCharSet(NonDefaultCharSet);
+
+                            e.ComplexProperty<Dictionary<string, object>>("ComplexProperty")
+                                .Property<string>("Brand")
+                                .HasCharSet(NonDefaultCharSet);
                         }),
                 result =>
                 {
                     var table = Assert.Single(result.Tables);
                     var nameColumn = Assert.Single(table.Columns.Where(c => c.Name == "Name"));
                     var brandColumn = Assert.Single(table.Columns.Where(c => c.Name == "Brand"));
+                    var complexBrandColumn = Assert.Single(table.Columns.Where(c => c.Name == "ComplexProperty_Brand"));
 
                     Assert.Null(nameColumn[MySqlAnnotationNames.CharSet]);
                     Assert.Null(nameColumn.Collation);
                     Assert.Equal(NonDefaultCharSet, brandColumn[MySqlAnnotationNames.CharSet]);
                     Assert.NotEqual(DefaultCollation, brandColumn.Collation);
+                    Assert.Equal(NonDefaultCharSet, complexBrandColumn[MySqlAnnotationNames.CharSet]);
+                    Assert.NotEqual(DefaultCollation, complexBrandColumn.Collation);
                 });
 
             AssertSql(
@@ -1249,6 +1257,7 @@ await Test(
     `IceCreamId` int NOT NULL AUTO_INCREMENT,
     `Brand` longtext CHARACTER SET {NonDefaultCharSet} NULL,
     `Name` longtext COLLATE {DefaultCollation} NULL,
+    `ComplexProperty_Brand` longtext CHARACTER SET {NonDefaultCharSet} NULL,
     CONSTRAINT `PK_IceCream` PRIMARY KEY (`IceCreamId`)
 ) COLLATE={DefaultCollation};");
         }