Merge pull request #344 from svetrivel/issue-343

Return new connection string builder instance if connection string changes

Author: azygis

src/Hangfire.PostgreSql/Factories/NpgsqlConnectionFactory.cs

@@ -11,6 +11,7 @@ public sealed class NpgsqlConnectionFactory : NpgsqlInstanceConnectionFactoryBas
 {
   private readonly string _connectionString;
   [CanBeNull] private readonly Action<NpgsqlConnection> _connectionSetup;
+  [CanBeNull] private readonly Func<string> _getConnectionString;
 
   /// <summary>
   /// Instantiates the factory using specified <paramref name="connectionString"/>.
@@ -25,10 +26,21 @@ public NpgsqlConnectionFactory(string connectionString, PostgreSqlStorageOptions
     _connectionSetup = connectionSetup;
   }
 
+  public NpgsqlConnectionFactory(Func<string> getConnectionString, PostgreSqlStorageOptions options, [CanBeNull] Action<NpgsqlConnection> connectionSetup = null) : this(getConnectionString.Invoke(), options, connectionSetup)
+  {
+    _getConnectionString = getConnectionString;
+  }
+
   /// <inheritdoc />
   public override NpgsqlConnection GetOrCreateConnection()
   {
-    NpgsqlConnection connection = new(_connectionString);
+    var connectionString = _connectionString;
+    if (_getConnectionString != null)
+    {
+      connectionString = SetupConnectionStringBuilder(_getConnectionString.Invoke()).ConnectionString;
+    }
+    
+    NpgsqlConnection connection = new(connectionString);
     _connectionSetup?.Invoke(connection);
     return connection;
   }

src/Hangfire.PostgreSql/Factories/NpgsqlInstanceConnectionFactoryBase.cs

@@ -8,6 +8,7 @@ public abstract class NpgsqlInstanceConnectionFactoryBase : IConnectionFactory
 {
   private readonly PostgreSqlStorageOptions _options;
   [CanBeNull] private NpgsqlConnectionStringBuilder _connectionStringBuilder;
+  [CanBeNull] private string _connectionString;
 
   protected NpgsqlInstanceConnectionFactoryBase(PostgreSqlStorageOptions options)
   {
@@ -23,13 +24,14 @@ protected NpgsqlInstanceConnectionFactoryBase(PostgreSqlStorageOptions options)
 
   protected NpgsqlConnectionStringBuilder SetupConnectionStringBuilder(string connectionString)
   {
-    if (_connectionStringBuilder != null)
+    if (_connectionStringBuilder != null && string.Equals(_connectionString, connectionString, StringComparison.OrdinalIgnoreCase))
     {
       return _connectionStringBuilder;
     }
 
     try
     {
+      _connectionString = connectionString;
       NpgsqlConnectionStringBuilder builder = new(connectionString);
 
       // The connection string must not be modified when transaction enlistment is enabled, otherwise it will cause

src/Hangfire.PostgreSql/PostgreSqlBootstrapperOptions.cs

@@ -42,6 +42,11 @@ public PostgreSqlBootstrapperOptions UseNpgsqlConnection(string connectionString
     return UseConnectionFactory(new NpgsqlConnectionFactory(connectionString, _options, connectionSetup));
   }
 
+  public PostgreSqlBootstrapperOptions UseNpgsqlConnection(Func<string> getConnectionString, [CanBeNull] Action<NpgsqlConnection> connectionSetup = null)
+  {
+    return UseConnectionFactory(new NpgsqlConnectionFactory(getConnectionString, _options, connectionSetup));
+  }
+
   /// <summary>
   /// Configures the bootstrapper to use the existing <see cref="NpgsqlConnection"/> for each database action.
   /// </summary>