Merge pull request #88 from johelvisguzman/adonet-configmanager

Allow ado-net repository to be instantiated using only a connection string

Author: johelvisguzman

src/DotNetToolkit.Repository.AdoNet/AdoNetRepository.cs

@@ -9,13 +9,26 @@ public class AdoNetRepository<TEntity, TKey> : AdoNetRepositoryBase<TEntity, TKe
     {
         #region Constructors
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public AdoNetRepository(string connectionString) : base(connectionString) { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
         public AdoNetRepository(string providerName, string connectionString) : base(providerName, connectionString) { }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="logger">The logger.</param>
+        public AdoNetRepository(string connectionString, ILogger logger) : base(connectionString, logger) { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
         /// </summary>
@@ -35,14 +48,27 @@ public class AdoNetRepository<TEntity> : AdoNetRepositoryBase<TEntity, int>, IRe
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public AdoNetRepository(string connectionString) : base(connectionString) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>
         public AdoNetRepository(string providerName, string connectionString) : base(providerName, connectionString) { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity, TKey}" /> class.
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="logger">The logger.</param>
+        public AdoNetRepository(string connectionString, ILogger logger) : base(connectionString, logger) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepository{TEntity}" /> class.
         /// </summary>
         /// <param name="providerName">The name of the provider.</param>
         /// <param name="connectionString">The connection string.</param>

src/DotNetToolkit.Repository.AdoNet/AdoNetRepositoryBase.cs

@@ -10,6 +10,7 @@
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
+    using System.Configuration;
     using System.Data;
     using System.Data.Common;
     using System.Linq;
@@ -66,6 +67,26 @@ public abstract class AdoNetRepositoryBase<TEntity, TKey> : RepositoryAsyncBase<
 
         #region Constructors
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNetRepositoryBase{TEntity, TKey}"/> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="logger">The logger.</param>
+        protected AdoNetRepositoryBase(string connectionString, ILogger logger = null) : base(logger)
+        {
+            if (string.IsNullOrEmpty(connectionString))
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(connectionString));
+
+            var ccs = ConfigurationManager.ConnectionStrings[connectionString];
+            if (ccs == null)
+                throw new ArgumentException(Resources.ConnectionStringDoestNotExistInConfigFile);
+
+            Factory = Internal.DbProviderFactories.GetFactory(ccs.ProviderName);
+            ConnectionString = connectionString;
+
+            Initialize();
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdoNetRepositoryBase{TEntity, TKey}"/> class.
         /// </summary>
@@ -74,6 +95,9 @@ public abstract class AdoNetRepositoryBase<TEntity, TKey> : RepositoryAsyncBase<
         /// <param name="logger">The logger.</param>
         protected AdoNetRepositoryBase(string providerName, string connectionString, ILogger logger = null) : base(logger)
         {
+            if (string.IsNullOrEmpty(providerName))
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(providerName));
+
             if (string.IsNullOrEmpty(connectionString))
                 throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmptyString, nameof(connectionString));
 
@@ -1686,7 +1710,7 @@ private TEntity AutoMap(DbDataReader r, DbSqlSelectStatementConfig config)
 
         #endregion
 
-        #region Overrides of RepositoryBase<TEntity,TKey>
+        #region Overrides of RepositoryBase<TEntity, TKey>
 
         /// <summary>
         /// A protected overridable method for adding the specified <paramref name="entity" /> into the repository.
@@ -1916,7 +1940,7 @@ public override void Dispose()
 
         #endregion
 
-        #region Overrides of RepositoryAsyncBase<TEntity,TKey>
+        #region Overrides of RepositoryAsyncBase<TEntity, TKey>
 
         /// <summary>
         /// A protected asynchronous overridable method for saving changes made in the current unit of work in the repository.

src/DotNetToolkit.Repository.AdoNet/AdoNetRepositoryFactory.cs

@@ -38,24 +38,38 @@ public AdoNetRepositoryFactory(IRepositoryFactoryOptions options)
 
         #region Private Methods
 
-        private Tuple<string, string> GetProviderAndConnectionString(IRepositoryFactoryOptions options)
+        private void GetProviderAndConnectionString(IRepositoryFactoryOptions options, out string providerName, out string connectionString)
         {
             if (options == null)
                 throw new ArgumentNullException(nameof(options));
 
-            var arg1 = options.DbContextArgs[0];
-            var provider = arg1 as string;
+            if (options.DbContextArgs == null || options.DbContextArgs.Length == 0)
+                throw new InvalidOperationException($"The repository options must provide a '{nameof(options.DbContextArgs)}'.");
 
-            if (arg1 != null && provider == null)
-                throw new ArgumentException($"The provided {nameof(options.DbContextArgs)} must be a valid string argument.");
+            if (options.DbContextArgs.Length == 1)
+            {
+                var arg1 = options.DbContextArgs[0];
+                connectionString = arg1 as string;
 
-            var arg2 = options.DbContextArgs[1];
-            var connectionString = arg1 as string;
+                if (arg1 != null && connectionString == null)
+                    throw new ArgumentException($"The provided '{nameof(options.DbContextArgs)}' must be a valid string argument to be used as a connection string.");
 
-            if (arg2 != null && connectionString == null)
-                throw new ArgumentException($"The connection string {nameof(options.DbContextArgs)} must be a valid string argument.");
+                providerName = null;
+            }
+            else
+            {
+                var arg1 = options.DbContextArgs[0];
+                providerName = arg1 as string;
 
-            return Tuple.Create<string, string>(provider, connectionString);
+                if (arg1 != null && providerName == null)
+                    throw new ArgumentException($"The provided '{nameof(options.DbContextArgs)}' must be a valid string argument to be used as a provider name.");
+
+                var arg2 = options.DbContextArgs[1];
+                connectionString = arg1 as string;
+
+                if (arg2 != null && connectionString == null)
+                    throw new ArgumentException($"The provided '{nameof(options.DbContextArgs)}' must be a valid string argument to be used as a connection string.");
+            }
         }
 
         #endregion
@@ -97,8 +111,11 @@ public IRepository<TEntity, TKey> Create<TEntity, TKey>() where TEntity : class
         /// <returns>The new repository.</returns>
         public IRepository<TEntity> Create<TEntity>(IRepositoryFactoryOptions options) where TEntity : class
         {
-            var t = GetProviderAndConnectionString(options);
-            return new AdoNetRepository<TEntity>(t.Item1, t.Item2, options.Logger);
+            GetProviderAndConnectionString(options, out string providerName, out string connectionString);
+
+            return string.IsNullOrEmpty(providerName)
+                ? new AdoNetRepository<TEntity>(connectionString, options.Logger)
+                : new AdoNetRepository<TEntity>(providerName, connectionString, options.Logger);
         }
 
         /// <summary>
@@ -110,8 +127,11 @@ public IRepository<TEntity> Create<TEntity>(IRepositoryFactoryOptions options) w
         /// <returns>The new repository.</returns>
         public IRepository<TEntity, TKey> Create<TEntity, TKey>(IRepositoryFactoryOptions options) where TEntity : class
         {
-            var t = GetProviderAndConnectionString(options);
-            return new AdoNetRepository<TEntity, TKey>(t.Item1, t.Item2, options.Logger);
+            GetProviderAndConnectionString(options, out string providerName, out string connectionString);
+
+            return string.IsNullOrEmpty(providerName)
+                ? new AdoNetRepository<TEntity, TKey>(connectionString, options.Logger)
+                : new AdoNetRepository<TEntity, TKey>(providerName, connectionString, options.Logger);
         }
 
         #endregion

src/DotNetToolkit.Repository.AdoNet/DotNetToolkit.Repository.AdoNet.csproj

@@ -10,6 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager">
+      <Version>4.5.0-rc1</Version>
+    </PackageReference>
     <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
   </ItemGroup>
 
@@ -29,6 +32,10 @@
     <ProjectReference Include="..\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

src/DotNetToolkit.Repository.AdoNet/Properties/Resources.Designer.cs

@@ -129,4 +129,7 @@
   <data name="InvalidColumnName" xml:space="preserve">
     <value>The column name {0} is not valid.</value>
   </data>
+  <data name="ConnectionStringDoestNotExistInConfigFile" xml:space="preserve">
+    <value>The connection string does not exist in your configuration file.</value>
+  </data>
 </root>

src/DotNetToolkit.Repository.AdoNet/Properties/Resources.resx

@@ -10,15 +10,15 @@ public class CsvRepository<TEntity, TKey> : CsvRepositoryBase<TEntity, TKey> whe
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CsvRepository{TEntity,TKey}"/> class.
+        /// Initializes a new instance of the <see cref="CsvRepository{TEntity, TKey}"/> class.
         /// </summary>
         /// <param name="filePath">The file path.</param>
         public CsvRepository(string filePath) : base(filePath)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CsvRepository{TEntity}"/> class.
+        /// Initializes a new instance of the <see cref="CsvRepository{TEntity, TKey}"/> class.
         /// </summary>
         /// <param name="filePath">The file path.</param>
         /// <param name="logger">The logger.</param>

src/DotNetToolkit.Repository.Csv/CsvRepository.cs

@@ -32,7 +32,7 @@ protected CsvRepositoryBase(string filePath, ILogger logger) : base(filePath, lo
 
         #endregion
 
-        #region Overrides of InMemoryRepositoryFileBase<TEntity,TKey>
+        #region Overrides of InMemoryRepositoryFileBase<TEntity, TKey>
 
         /// <summary>
         /// Gets the file extension.

src/DotNetToolkit.Repository.Csv/CsvRepositoryBase.cs

@@ -48,7 +48,7 @@ private string GetFilePath(IRepositoryFactoryOptions options)
             var databaseName = arg as string;
 
             if (arg != null && databaseName == null)
-                throw new ArgumentException($"The provided {nameof(options.DbContextArgs)} must be a valid string argument.");
+                throw new ArgumentException($"The provided '{nameof(options.DbContextArgs)}' must be a valid string argument.");
 
             return databaseName;
         }

src/DotNetToolkit.Repository.Csv/CsvRepositoryFactory.cs

@@ -40,7 +40,7 @@ public class EfRepository<TEntity> : EfRepositoryBase<TEntity, int>, IRepository
         public EfRepository(DbContext context) : base(context) { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="EfRepository{TEntity, TKey}" /> class.
+        /// Initializes a new instance of the <see cref="EfRepository{TEntity}" /> class.
         /// </summary>
         /// <param name="context">The database context.</param>
         /// <param name="logger">The logger.</param>