Enable primitive collections and refactor MySQL EF options.

Added support for primitive collections and parameterized collection translation in MySQL EF configurations. Removed redundant `EnablePrimitiveCollectionsSupport` calls in program configuration to centralize the behavior.
elsa-workflows · Dec 28, 2024 · 4ed58c6 · 4ed58c6
1 parent 021795f
commit 4ed58c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/apps/Elsa.Server.Web/Program.cs b/src/apps/Elsa.Server.Web/Program.cs
@@ -150,8 +150,8 @@
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.PostgreSql)
                             ef.UsePostgreSql(postgresConnectionString!);
 #if !NET9_0
-                        else if (sqlDatabaseProvider == SqlDatabaseProvider.MySql)
-                            ef.UseMySql(mySqlConnectionString, null, opt => opt.EnablePrimitiveCollectionsSupport());
+                        else if (sqlDatabaseProvider == SqlDatabaseProvider.MySql) 
+                            ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
@@ -187,7 +187,7 @@
                             ef.UsePostgreSql(postgresConnectionString!);
 #if !NET9_0
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.MySql)
-                            ef.UseMySql(mySqlConnectionString, null, opt => opt.EnablePrimitiveCollectionsSupport());
+                            ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
@@ -233,7 +233,7 @@
                             ef.UsePostgreSql(postgresConnectionString!);
 #if !NET9_0
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.MySql)
-                            ef.UseMySql(mySqlConnectionString, null, opt => opt.EnablePrimitiveCollectionsSupport());
+                            ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
@@ -361,7 +361,7 @@
                             ef.UsePostgreSql(postgresConnectionString);
 #if !NET9_0
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.MySql)
-                            ef.UseMySql(mySqlConnectionString, null, opt => opt.EnablePrimitiveCollectionsSupport());
+                            ef.UseMySql(mySqlConnectionString);
 #endif
                         else if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb)
                             ef.UsePostgreSql(cockroachDbConnectionString!);
@@ -550,7 +550,7 @@
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.PostgreSql) ef.UsePostgreSql(postgresConnectionString);
 #if !NET9_0
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.MySql) 
-                                    ef.UseMySql(mySqlConnectionString, null, opt => opt.EnablePrimitiveCollectionsSupport());
+                                    ef.UseMySql(mySqlConnectionString);
 #endif
                                 if (sqlDatabaseProvider == SqlDatabaseProvider.CockroachDb) ef.UsePostgreSql(cockroachDbConnectionString);
                             });

diff --git a/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs b/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs
@@ -23,7 +23,9 @@ public static DbContextOptionsBuilder UseElsaMySql(this DbContextOptionsBuilder
                 db
                     .MigrationsAssembly(options.GetMigrationsAssemblyName(migrationsAssembly))
                     .MigrationsHistoryTable(options.GetMigrationsHistoryTableName(), options.GetSchemaName())
-                    .SchemaBehavior(MySqlSchemaBehavior.Ignore);
+                    .SchemaBehavior(MySqlSchemaBehavior.Ignore)
+                    .EnablePrimitiveCollectionsSupport()
+                    .TranslateParameterizedCollectionsToConstants();
 
                 configure?.Invoke(db);
             });