add flexibility when registering with connectionString

Author: pwelter34

src/FluentCommand/DataConfigurationBuilder.cs

@@ -15,8 +15,7 @@ namespace FluentCommand;
 public class DataConfigurationBuilder
 {
     private readonly IServiceCollection _services;
-    private string _connectionName;
-    private string _connectionString;
+    private string _nameOrConnectionString;
     private Type _providerFactoryType;
     private Type _dataCacheType;
     private Type _queryGeneratorType;
@@ -33,15 +32,15 @@ public DataConfigurationBuilder(IServiceCollection services)
 
 
     /// <summary>
-    /// The name of the connection to resolve the connection string from configuration.
+    /// Set the connection string or the name of connection string located in the application configuration
     /// </summary>
-    /// <param name="connectionName">Name of the connection.</param>
+    /// <param name="nameOrConnectionString">The connection string or the name of connection string located in the application configuration.</param>
     /// <returns>
     /// The same configuration builder so that multiple calls can be chained.
     /// </returns>
-    public DataConfigurationBuilder UseConnectionName(string connectionName)
+    public DataConfigurationBuilder UseConnectionName(string nameOrConnectionString)
     {
-        _connectionName = connectionName;
+        _nameOrConnectionString = nameOrConnectionString;
         return this;
     }
 
@@ -54,7 +53,7 @@ public DataConfigurationBuilder UseConnectionName(string connectionName)
     /// </returns>
     public DataConfigurationBuilder UseConnectionString(string connectionString)
     {
-        _connectionString = connectionString;
+        _nameOrConnectionString = connectionString;
         return this;
     }
 
@@ -323,34 +322,18 @@ internal void AddConfiguration()
         var queryGenerator = _queryGeneratorType ?? typeof(IQueryGenerator);
         var queryLogger = _queryLoggerType ?? typeof(IDataQueryLogger);
 
-        if (_connectionName.HasValue())
+        _services.TryAddSingleton<IDataConfiguration>(sp =>
         {
-            _services.TryAddSingleton<IDataConfiguration>(sp =>
-            {
-                var configuration = sp.GetRequiredService<IConfiguration>();
-                var connectionString = configuration.GetConnectionString(_connectionName);
-
-                return new DataConfiguration(
-                    sp.GetRequiredService(providerFactory) as DbProviderFactory,
-                    connectionString,
-                    sp.GetService(dataCache) as IDataCache,
-                    sp.GetService(queryGenerator) as IQueryGenerator,
-                    sp.GetService(queryLogger) as IDataQueryLogger
-                );
-            });
-        }
-        else
-        {
-            _services.TryAddSingleton<IDataConfiguration>(sp =>
-                new DataConfiguration(
-                    sp.GetRequiredService(providerFactory) as DbProviderFactory,
-                    _connectionString,
-                    sp.GetService(dataCache) as IDataCache,
-                    sp.GetService(queryGenerator) as IQueryGenerator,
-                    sp.GetService(queryLogger) as IDataQueryLogger
-                )
+            var connectionString = ResolveConnectionString(sp, _nameOrConnectionString);
+
+            return new DataConfiguration(
+                sp.GetRequiredService(providerFactory) as DbProviderFactory,
+                connectionString,
+                sp.GetService(dataCache) as IDataCache,
+                sp.GetService(queryGenerator) as IQueryGenerator,
+                sp.GetService(queryLogger) as IDataQueryLogger
             );
-        }
+        });
 
         _services.TryAddTransient<IDataSessionFactory>(sp => sp.GetService<IDataConfiguration>());
         _services.TryAddTransient<IDataSession, DataSession>();
@@ -366,34 +349,18 @@ internal void AddConfiguration<TDiscriminator>()
         var queryGenerator = _queryGeneratorType ?? typeof(IQueryGenerator);
         var queryLogger = _queryLoggerType ?? typeof(IDataQueryLogger);
 
-        if (_connectionName.HasValue())
-        {
-            _services.TryAddSingleton<IDataConfiguration<TDiscriminator>>(sp =>
-            {
-                var configuration = sp.GetRequiredService<IConfiguration>();
-                var connectionString = configuration.GetConnectionString(_connectionName);
-
-                return new DataConfiguration<TDiscriminator>(
-                    sp.GetRequiredService(providerFactory) as DbProviderFactory,
-                    connectionString,
-                    sp.GetService(dataCache) as IDataCache,
-                    sp.GetService(queryGenerator) as IQueryGenerator,
-                    sp.GetService(queryLogger) as IDataQueryLogger
-                );
-            });
-        }
-        else
+        _services.TryAddSingleton<IDataConfiguration<TDiscriminator>>(sp =>
         {
-            _services.TryAddSingleton<IDataConfiguration<TDiscriminator>>(sp =>
-                new DataConfiguration<TDiscriminator>(
-                    sp.GetRequiredService(providerFactory) as DbProviderFactory,
-                    _connectionString,
-                    sp.GetService(dataCache) as IDataCache,
-                    sp.GetService(queryGenerator) as IQueryGenerator,
-                    sp.GetService(queryLogger) as IDataQueryLogger
-                )
+            var connectionString = ResolveConnectionString(sp, _nameOrConnectionString);
+
+            return new DataConfiguration<TDiscriminator>(
+                sp.GetRequiredService(providerFactory) as DbProviderFactory,
+                connectionString,
+                sp.GetService(dataCache) as IDataCache,
+                sp.GetService(queryGenerator) as IQueryGenerator,
+                sp.GetService(queryLogger) as IDataQueryLogger
             );
-        }
+        });
 
         _services.TryAddTransient<IDataSessionFactory<TDiscriminator>>(sp => sp.GetService<IDataConfiguration<TDiscriminator>>());
         _services.TryAddTransient<IDataSession<TDiscriminator>, DataSession<TDiscriminator>>();
@@ -422,4 +389,25 @@ private void RegisterDefaults()
             _services.TryAddSingleton<IDataQueryLogger, DataQueryLogger>();
 
     }
+
+    private static string ResolveConnectionString(IServiceProvider serviceProvider, string nameOrConnectionString)
+    {
+        var isConnectionString = nameOrConnectionString.IndexOfAny([';', '=']) > 0;
+        if (isConnectionString)
+            return nameOrConnectionString;
+
+        var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+
+        // first try connection strings section
+        var connectionString = configuration.GetConnectionString(nameOrConnectionString);
+        if (connectionString.HasValue())
+            return connectionString;
+
+        // next try root collection
+        connectionString = configuration[nameOrConnectionString];
+        if (connectionString.HasValue())
+            return connectionString;
+
+        return null;
+    }
 }

src/FluentCommand/ServiceCollectionExtensions.cs

@@ -11,13 +11,13 @@ public static class ServiceCollectionExtensions
     /// Adds the fluent command services with the specified connection string.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-    /// <param name="connectionString">The connection string to use.</param>
+    /// <param name="nameOrConnectionString">The connection string or the name of connection string located in the application configuration.</param>
     /// <returns>
     /// The same service collection so that multiple calls can be chained.
     /// </returns>
-    public static IServiceCollection AddFluentCommand(this IServiceCollection services, string connectionString)
+    public static IServiceCollection AddFluentCommand(this IServiceCollection services, string nameOrConnectionString)
     {
-        services.AddFluentCommand(builder => builder.UseConnectionString(connectionString));
+        services.AddFluentCommand(builder => builder.UseConnectionName(nameOrConnectionString));
 
         return services;
     }
@@ -45,13 +45,13 @@ public static IServiceCollection AddFluentCommand(this IServiceCollection servic
     /// </summary>
     /// <typeparam name="TDiscriminator">The type of the discriminator.</typeparam>
     /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-    /// <param name="connectionString">The connection string to use.</param>
+    /// <param name="nameOrConnectionString">The connection string or the name of connection string located in the application configuration.</param>
     /// <returns>
     /// The same service collection so that multiple calls can be chained.
     /// </returns>
-    public static IServiceCollection AddFluentCommand<TDiscriminator>(this IServiceCollection services, string connectionString)
+    public static IServiceCollection AddFluentCommand<TDiscriminator>(this IServiceCollection services, string nameOrConnectionString)
     {
-        services.AddFluentCommand<TDiscriminator>(builder => builder.UseConnectionString(connectionString));
+        services.AddFluentCommand<TDiscriminator>(builder => builder.UseConnectionName(nameOrConnectionString));
 
         return services;
     }