Add support for name= connection strings (named connection strings). (

#1611)
PomeloFoundation · Jan 30, 2022 · 957d151 · 957d151
1 parent 7ed2f56
commit 957d151
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/EFCore.MySql/Extensions/MySqlDbContextOptionsBuilderExtensions.cs b/src/EFCore.MySql/Extensions/MySqlDbContextOptionsBuilderExtensions.cs
@@ -8,6 +8,7 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 using MySqlConnector;
 
@@ -97,17 +98,20 @@ public static class MySqlDbContextOptionsBuilderExtensions
             Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotEmpty(connectionString, nameof(connectionString));
 
-            var csb = new MySqlConnectionStringBuilder(connectionString)
+            var resolvedConnectionString = new NamedConnectionStringResolver(optionsBuilder.Options)
+                .ResolveConnectionString(connectionString);
+
+            var csb = new MySqlConnectionStringBuilder(resolvedConnectionString)
             {
                 AllowUserVariables = true,
                 UseAffectedRows = false
             };
 
-            connectionString = csb.ConnectionString;
+            resolvedConnectionString = csb.ConnectionString;
 
             var extension = (MySqlOptionsExtension)GetOrCreateExtension(optionsBuilder)
                 .WithServerVersion(serverVersion)
-                .WithConnectionString(connectionString);
+                .WithConnectionString(resolvedConnectionString);
 
             ((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
             ConfigureWarnings(optionsBuilder);
@@ -151,7 +155,12 @@ public static class MySqlDbContextOptionsBuilderExtensions
             Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotNull(connection, nameof(connection));
 
-            var csb = new MySqlConnectionStringBuilder(connection.ConnectionString);
+            var resolvedConnectionString = connection.ConnectionString is not null
+                ? new NamedConnectionStringResolver(optionsBuilder.Options)
+                    .ResolveConnectionString(connection.ConnectionString)
+                : null;
+
+            var csb = new MySqlConnectionStringBuilder(resolvedConnectionString);
 
             if (!csb.AllowUserVariables ||
                 csb.UseAffectedRows)