Dev

ADO.ExecuteCommand.Core/ADO.ExecuteCommand.Core.xproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>b7737b4f-4c59-4ce5-aa62-0a6cca639473</ProjectGuid>
+    <RootNamespace>ADO.ExecuteCommand.Core</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

ADO.ExecuteCommand.Core/Helper/CommandHelper.Factory.cs

@@ -0,0 +1,34 @@
+using System;
+
+namespace ADO.ExecuteCommand.Helper
+{
+    public abstract partial class CommandHelper
+    {
+        #region - Factory -
+
+        public static CommandHelper CreateHelper(DataAccessSectionSettings settings)
+        {
+            try
+            {
+                var providerType = settings.Type;
+
+                var daType = Type.GetType(providerType);
+                if (daType == null) throw new NullReferenceException("Null Reference in Provider type configuration Session.");
+
+                var provider = Activator.CreateInstance(daType, settings.ConnectionString);
+                if (provider is CommandHelper)
+                {
+                    return provider as CommandHelper;
+                }
+
+                throw new Exception("The provider specified does not extends the QueryRunner abstract class.");
+            }
+            catch (Exception e)
+            {
+                throw new Exception("If the section is not defined on the configuration file this method can't be used to create an QueryRunner instance.", e);
+            }
+        }
+
+        #endregion
+    }
+}

ADO.ExecuteCommand/Helper/CommandHelper.cs → ADO.ExecuteCommand.Core/Helper/CommandHelper.cs

@@ -1,60 +1,28 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Data;
 using System.Linq;
 using ADO.ExecuteCommand.Commands;
 
 namespace ADO.ExecuteCommand.Helper
 {
-    public abstract class CommandHelper
+    public abstract partial class CommandHelper
     {
         #region Declare members
 
-        protected static Hashtable ParamCache = Hashtable.Synchronized(new Hashtable());
-        protected static string ConnectionString;
+        protected string ConnectionString;
 
         #endregion
 
+        protected CommandHelper(string connectionString)
+        {
+            this.ConnectionString = connectionString;
+        }
+
         #region Provider specific abstract methods
 
         public abstract IDbConnection GetConnection();
         protected abstract IDataParameter GetParameter();
-        protected abstract IDbDataAdapter GetDataAdapter();
-        protected abstract void DeriveParameters(IDbCommand cmd);
-        protected abstract DataTable FillTable(IDbDataAdapter da);
-
-        #endregion
-
-        #region Factory
-
-        public static CommandHelper CreateHelper(string providerAlias)
-        {
-            try
-            {
-                var dict = ConfigurationManager.GetSection("DataCommandProviders") as IDictionary;
-                if (dict == null) throw new Exception("Null Reference in DataAccess Provider configuration Session.");
-
-                var providerConfig = dict[providerAlias] as ProviderAlias;
-                if (providerConfig == null) throw new Exception("Null Reference in Provider Alias configuration Session.");
-
-                var providerType = providerConfig.TypeName;
-                ConnectionString = providerConfig.ConnectionString;
-
-                var daType = Type.GetType(providerType);
-                if (daType == null) throw new Exception("Null Reference in Provider type configuration Session.");
-
-                var provider = daType.Assembly.CreateInstance(daType.FullName);
-                if (provider is CommandHelper) return provider as CommandHelper;
-
-                throw new Exception("The provider specified does not extends the AdoHelper abstract class.");
-            }
-            catch (Exception e)
-            {
-                throw new Exception("If the section is not defined on the configuration file this method can't be used to create an AdoHelper instance.", e);
-            }
-        }
 
         #endregion
 
@@ -86,55 +54,6 @@ protected virtual void AttachParameters(IDbCommand command, IDataParameter[] com
             }
         }
 
-        protected void AssignParameterValues(IDataParameter[] commandParameters, DataRow dataRow)
-        {
-            if ((commandParameters == null) || (dataRow == null))
-            {
-                return;
-            }
-
-            var columns = dataRow.Table.Columns;
-
-            var i = 0;
-            foreach (var commandParameter in commandParameters)
-            {
-                if (commandParameter.ParameterName == null || commandParameter.ParameterName.Length <= 1)
-                    throw new Exception($"Please provide a valid parameter name on the parameter #{i}, the ParameterName property has the following value: '{commandParameter.ParameterName}'.");
-
-                if (columns.Contains(commandParameter.ParameterName)) commandParameter.Value = dataRow[commandParameter.ParameterName];
-                else if (columns.Contains(commandParameter.ParameterName.Substring(1))) commandParameter.Value = dataRow[commandParameter.ParameterName.Substring(1)];
-
-                i++;
-            }
-        }
-
-        protected void AssignParameterValues(IDataParameter[] commandParameters, object[] parameterValues)
-        {
-            if ((commandParameters == null) || (parameterValues == null))
-            {
-                return;
-            }
-
-            if (commandParameters.Length != parameterValues.Length)
-            {
-                throw new ArgumentException("Parameter count does not match Parameter Value count.");
-            }
-
-            for (var i = 0; i < commandParameters.Length; i++)
-            {
-                var param = parameterValues[i] as IDataParameter;
-                if (param != null)
-                {
-                    var paramInstance = param;
-                    commandParameters[i].Value = paramInstance.Value ?? DBNull.Value;
-
-                    continue;
-                }
-
-                commandParameters[i].Value = parameterValues[i] ?? DBNull.Value;
-            }
-        }
-
         protected virtual bool PrepareCommand(IDbCommand command, IDbConnection connection, IDbTransaction transaction, CommandType commandType, string commandText, IDataParameter[] commandParameters)
         {
             var mustCloseConnection = false;
@@ -167,10 +86,6 @@ protected virtual bool PrepareCommand(IDbCommand command, IDbConnection connecti
             return mustCloseConnection;
         }
 
-        protected virtual void ClearCommand(IDbCommand command)
-        {
-        }
-
         #endregion private utility methods
 
         #region ExecuteNonCommand

ADO.ExecuteCommand.Core/Helper/DataAccessSectionSettings.cs

@@ -0,0 +1,14 @@
+namespace ADO.ExecuteCommand.Helper
+{
+    public class DataAccessSectionSettings
+    {
+        public DataAccessSectionSettings(string type, string connectionString)
+        {
+            Type = type;
+            ConnectionString = connectionString;
+        }
+
+        public string Type { get; }
+        public string ConnectionString { get; }
+    }
+}

ADO.ExecuteCommand/Helper/MsSql.cs → ADO.ExecuteCommand.Core/Helper/MsSql.cs

@@ -7,6 +7,10 @@ namespace ADO.ExecuteCommand.Helper
 {
     public class MsSql : CommandHelper
     {
+        public MsSql(string connectionString) : base(connectionString)
+        {
+        }
+
         public override IDbConnection GetConnection()
         {
             if (string.IsNullOrEmpty(ConnectionString)) throw new NullReferenceException("ConnectionString");
@@ -28,24 +32,5 @@ protected override IDataParameter GetParameter()
         {
             return new SqlParameter();
         }
-
-        protected override IDbDataAdapter GetDataAdapter()
-        {
-            return new SqlDataAdapter();
-        }
-
-        protected override void DeriveParameters(IDbCommand cmd)
-        {
-            if (!(cmd is SqlCommand)) throw new ArgumentException("The command provided is not a SqlCommand instance.", nameof(cmd));
-            SqlCommandBuilder.DeriveParameters((SqlCommand)cmd);
-        }
-
-        protected override DataTable FillTable(IDbDataAdapter da)
-        {
-            var dt = new DataTable();
-            ((SqlDataAdapter)da).Fill(dt);
-
-            return dt;
-        }
     }
 }

ADO.ExecuteCommand/Helper/PgSql.cs → ADO.ExecuteCommand.Core/Helper/PgSql.cs

@@ -6,6 +6,10 @@ namespace ADO.ExecuteCommand.Helper
 {
     public class PgSql : CommandHelper
     {
+        public PgSql(string connectionString) : base(connectionString)
+        {
+        }
+
         public override IDbConnection GetConnection()
         {
             if (string.IsNullOrEmpty(ConnectionString)) throw new NullReferenceException("ConnectionString");
@@ -22,24 +26,5 @@ protected override IDataParameter GetParameter()
         {
             return new NpgsqlParameter();
         }
-
-        protected override IDbDataAdapter GetDataAdapter()
-        {
-            return new NpgsqlDataAdapter();
-        }
-
-        protected override void DeriveParameters(IDbCommand cmd)
-        {
-            if (!(cmd is NpgsqlCommand)) throw new ArgumentException("The command provided is not a NpgSqlCommand instance.", nameof(cmd));
-            NpgsqlCommandBuilder.DeriveParameters((NpgsqlCommand)cmd);
-        }
-
-        protected override DataTable FillTable(IDbDataAdapter da)
-        {
-            var dt = new DataTable();
-            ((NpgsqlDataAdapter)da).Fill(dt);
-
-            return dt;
-        }
     }
 }

ADO.ExecuteCommand.Core/Properties/AssemblyInfo.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ADO.ExecuteCommand.Core")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b7737b4f-4c59-4ce5-aa62-0a6cca639473")]

ADO.ExecuteCommand.Core/project.json

@@ -0,0 +1,17 @@
+{
+  "version": "1.0.0-*",
+
+  "dependencies": {
+    "NETStandard.Library": "1.6.0",
+    "Npgsql": "3.1.8",
+    "System.Collections.NonGeneric": "4.0.1",
+    "System.Data.Common": "4.1.0",
+    "System.Data.SqlClient": "4.1.0"
+  },
+
+  "frameworks": {
+    "netstandard1.4": {
+      "imports": "dnxcore50"
+    }
+  }
+}

ADO.ExecuteCommand.Test/AdoMocks/MockCommandHelper.cs

@@ -12,6 +12,10 @@ public class MockCommandHelper : CommandHelper
     {
         private IList<IDataParameter> parameters;
 
+        public MockCommandHelper(string connectionString) : base(connectionString)
+        {
+        }
+
         public IList<IDictionary<string, object>> ReturnValues { get; set; }
 
         public override IDbConnection GetConnection()
@@ -42,46 +46,6 @@ protected override IDataParameter GetParameter()
             return parameter;
         }
 
-        protected override IDbDataAdapter GetDataAdapter()
-        {
-            var dba = MockRepository.GenerateMock<IDbDataAdapter>();
-            dba.Expect(da => da.SelectCommand);
-
-            return dba;
-        }
-
-        protected override void DeriveParameters(IDbCommand cmd)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override DataTable FillTable(IDbDataAdapter da)
-        {
-            if (this.ReturnValues == null || !this.ReturnValues.Any()) throw new NoNullAllowedException();
-
-            var dt = new DataTable();
-            dt.Clear();
-
-            foreach (var col in this.ReturnValues[0].Keys)
-            {
-                dt.Columns.Add(col);
-            }
-
-            foreach (var rows in this.ReturnValues)
-            {
-                var row = dt.NewRow();
-
-                foreach (var returnValue in rows)
-                {
-                    row[returnValue.Key] = returnValue.Value;
-                }
-
-                dt.Rows.Add(row);
-            }
-
-            return dt;
-        }
-
         public IEnumerable<IDataParameter> Parameters => this.parameters;
     }
 }

ADO.ExecuteCommand.Test/ParametersTest.cs

@@ -13,7 +13,7 @@ public class ParametersTest
         [TestMethod]
         public void TestParametersInQuery()
         {
-            var commandHelper = new MockCommandHelper
+            var commandHelper = new MockCommandHelper(null)
             {
                 ReturnValues = new List<IDictionary<string, object>>
                 {
@@ -43,7 +43,7 @@ public void TestParametersInQuery()
         [TestMethod]
         public void TestNullParametersInQuery()
         {
-            var queryRunner = new MockCommandHelper
+            var queryRunner = new MockCommandHelper(null)
             {
                 ReturnValues = new List<IDictionary<string, object>>
                 {