From 8a9e00d92d9fa734f97a08063a47cbf3f8318d66 Mon Sep 17 00:00:00 2001 From: Raymond den Haan Date: Wed, 14 Feb 2024 09:51:09 +0100 Subject: [PATCH] Set fixed version for MySql --- migrations/efcore-3.1.sh | 12 +----------- .../DbContextOptionsBuilder.cs | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/migrations/efcore-3.1.sh b/migrations/efcore-3.1.sh index 74b995e12..32659c1d6 100644 --- a/migrations/efcore-3.1.sh +++ b/migrations/efcore-3.1.sh @@ -8,15 +8,6 @@ mods=("Management" "Runtime") providers=("MySql" "SqlServer" "Sqlite" "PostgreSql") # providers=("SqlServer") -# Connection strings for each provider -typeset -A connStrings -connStrings=( - MySql "Server=localhost;Port=3306;Database=elsa;User=root;Password=password;" - SqlServer "" - Sqlite "" - PostgreSql "" -) - # Loop through each module for module in "${mods[@]}"; do # Loop through each provider @@ -27,7 +18,6 @@ for module in "${mods[@]}"; do echo "Updating migrations for $provider..." echo "Provider path: ${providerPath:?}/${migrationsPath}" echo "Migrations path: $migrationsPath" - echo "Connection string: ${connStrings[$provider]}" # 1. Remove all migrations except the initial and restore the snapshot to that state. migrations=$(dotnet ef migrations list --no-connect -c "$module"ElsaDbContext -p "$providerPath" | grep -v ^Build | grep -v ^"Pending status" | grep -v Initial$) @@ -37,6 +27,6 @@ for module in "${mods[@]}"; do done # 2. Run the migrations command - dotnet ef migrations add V3_1 -c "$module"ElsaDbContext -p "$providerPath" -o "$migrationsPath" --connectionString "${connStrings[$provider]}" + dotnet ef migrations add V3_1 -c "$module"ElsaDbContext -p "$providerPath" -o "$migrationsPath" done done diff --git a/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs b/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs index 73effc94e..883329a0e 100644 --- a/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs +++ b/src/modules/Elsa.EntityFrameworkCore.MySql/DbContextOptionsBuilder.cs @@ -18,7 +18,7 @@ public static class DbContextOptionsBuilderExtensions public static DbContextOptionsBuilder UseElsaMySql(this DbContextOptionsBuilder builder, Assembly migrationsAssembly, string connectionString,ElsaDbContextOptions? options = default, Action? configure = default) => builder .UseElsaDbContextOptions(options) - .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), db => + .UseMySql(connectionString, ServerVersion.Create(7,0,14, ServerType.MySql), db => { db .MigrationsAssembly(options.GetMigrationsAssemblyName(migrationsAssembly))