Allowed the ado.net context to properly read a connection string from the config file

Author: jaguzman

src/DotNetToolkit.Repository.AdoNet/DbHelper.cs

@@ -32,18 +32,12 @@ public sealed class DbHelper : IDisposable
         private readonly string _connectionString;
         private DbConnection _connection;
         private readonly bool _ownsConnection;
-        private readonly Internal.DataAccessProviderType _providerType;
         private readonly IRepositoryConventions _conventions;
 
         #endregion
 
         #region Properties
 
-        /// <summary>
-        /// Gets the provider type.
-        /// </summary>
-        internal Internal.DataAccessProviderType ProviderType { get { return _providerType; } }
-
         /// <summary>
         /// Gets the provider factory.
         /// </summary>
@@ -88,13 +82,14 @@ internal DbHelper(IRepositoryConventions conventions, string nameOrConnectionStr
             Guard.NotNull(conventions, nameof(conventions));
             Guard.NotEmpty(nameOrConnectionString, nameof(nameOrConnectionString));
 
-            var css = GetConnectionStringSettings(nameOrConnectionString);
+            var css = Guard.EnsureNotNull(
+                GetConnectionStringSettings(nameOrConnectionString),
+                "The connection string does not exist in your configuration file.");
 
             _conventions = conventions;
             _factory = Internal.DbProviderFactories.GetFactory(css.ProviderName);
             _connectionString = css.ConnectionString;
             _ownsConnection = true;
-            _providerType = Internal.DataAccessProvider.GetProviderType(css.ProviderName);
         }
 
         /// <summary>
@@ -113,7 +108,6 @@ internal DbHelper(IRepositoryConventions conventions, string providerName, strin
             _factory = Internal.DbProviderFactories.GetFactory(providerName);
             _connectionString = connectionString;
             _ownsConnection = true;
-            _providerType = Internal.DataAccessProvider.GetProviderType(providerName);
         }
 
         /// <summary>
@@ -126,16 +120,9 @@ internal DbHelper(IRepositoryConventions conventions, DbConnection existingConne
             Guard.NotNull(conventions, nameof(conventions));
             Guard.NotNull(existingConnection, nameof(existingConnection));
 
-            if (existingConnection.State == ConnectionState.Closed)
-                existingConnection.Open();
-
             _conventions = conventions;
             _connection = existingConnection;
             _ownsConnection = false;
-
-            var css = GetConnectionStringSettings(existingConnection.ConnectionString);
-
-            _providerType = Internal.DataAccessProvider.GetProviderType(css.ProviderName);
         }
 
         #endregion
@@ -1305,21 +1292,18 @@ private static ConnectionStringSettings GetConnectionStringSettings(string nameO
         {
             var css = ConfigurationManager.ConnectionStrings[nameOrConnectionString];
 
-            if (css == null)
+            if (css != null)
+                return css;
+
+            for (var i = 0; i < ConfigurationManager.ConnectionStrings.Count; i++)
             {
-                for (var i = 0; i < ConfigurationManager.ConnectionStrings.Count; i++)
-                {
-                    css = ConfigurationManager.ConnectionStrings[i];
+                css = ConfigurationManager.ConnectionStrings[i];
 
-                    if (css.ConnectionString.Equals(nameOrConnectionString))
-                        break;
-                }
+                if (css.ConnectionString.Equals(nameOrConnectionString))
+                    return css;
             }
 
-            if (css == null)
-                throw new ArgumentException("The connection string does not exist in your configuration file.");
-
-            return css;
+            return null;
         }
 
         private static T ConvertValue<T>(object value)

src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetRepositoryContext.cs

@@ -161,16 +161,6 @@ private void PrepareEntitySetQuery(EntitySet entitySet, bool existInDb, out stri
 
                         QueryBuilder.CreateInsertStatement(Conventions, entitySet.Entity, out sql, out parameters);
 
-                        var canGetScopeIdentity = true;
-
-#if NETFULL
-                        if (_dbHelper.ProviderType == DataAccessProviderType.SqlServerCompact)
-                            canGetScopeIdentity = false;
-#endif
-
-                        if (canGetScopeIdentity)
-                            sql += $"{Environment.NewLine}SELECT SCOPE_IDENTITY()";
-
                         break;
                     }
                 case EntityState.Removed:
@@ -353,30 +343,17 @@ public int SaveChanges()
                         command.Parameters.Clear();
                         command.AddParameters(parameters);
 
+                        rows += _dbHelper.ExecuteNonQuery(command);
+
                         if (entitySet.State == EntityState.Added && isIdentity)
                         {
-#if NETFULL
-                            if (_dbHelper.ProviderType == DataAccessProviderType.SqlServerCompact)
-                            {
-                                _dbHelper.ExecuteNonQuery(command);
-
-                                sql = "SELECT @@IDENTITY";
-                                parameters.Clear();
-
-                                command.CommandText = sql;
-                                command.Parameters.Clear();
-                            }
-#endif
+                            command.CommandText = "SELECT @@IDENTITY";
+                            command.Parameters.Clear();
+
                             var newKey = _dbHelper.ExecuteScalar<object>(command);
                             var convertedKeyValue = Convert.ChangeType(newKey, primaryKeyPropertyInfo.PropertyType);
 
                             primaryKeyPropertyInfo.SetValue(entitySet.Entity, convertedKeyValue, null);
-
-                            rows++;
-                        }
-                        else
-                        {
-                            rows += _dbHelper.ExecuteNonQuery(command);
                         }
                     }
                 }
@@ -714,30 +691,17 @@ public IPagedQueryResult<IEnumerable<TResult>> GroupBy<TEntity, TGroupKey, TResu
                         command.Parameters.Clear();
                         command.AddParameters(parameters);
 
+                        rows += await _dbHelper.ExecuteNonQueryAsync(command, cancellationToken);
+
                         if (entitySet.State == EntityState.Added && isIdentity)
                         {
-#if NETFULL
-                            if (_dbHelper.ProviderType == DataAccessProviderType.SqlServerCompact)
-                            {
-                                await _dbHelper.ExecuteNonQueryAsync(command, cancellationToken);
-
-                                sql = "SELECT @@IDENTITY";
-                                parameters.Clear();
-
-                                command.CommandText = sql;
-                                command.Parameters.Clear();
-                            }
-#endif
+                            command.CommandText = "SELECT @@IDENTITY";
+                            command.Parameters.Clear();
+
                             var newKey = await _dbHelper.ExecuteScalarAsync<object>(command, cancellationToken);
                             var convertedKeyValue = Convert.ChangeType(newKey, primaryKeyPropertyInfo.PropertyType);
 
                             primaryKeyPropertyInfo.SetValue(entitySet.Entity, convertedKeyValue, null);
-
-                            rows++;
-                        }
-                        else
-                        {
-                            rows += await _dbHelper.ExecuteNonQueryAsync(command, cancellationToken);
                         }
                     }
                 }