Merge branch 'master' of https://github.com/afernandes/ConnectionFactory.NET

afernandes · afernandes · commit c0834c1d696b · 2017-08-24T23:21:01.000-03:00
diff --git a/src/CfCommand.DataAdapter.cs b/src/CfCommand.DataAdapter.cs
@@ -4,7 +4,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region DataAdapter
 
@@ -42,12 +46,15 @@ public DataSet DataAdapter(CfCommandType cmdType, string cmdText, IEnumerable<Cf
             }
         }
 
+<<<<<<< HEAD
         public DataSet DataAdapter(CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return DataAdapter(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         #endregion
     }
 }
diff --git a/src/CfCommand.ExecuteNonQuery.cs b/src/CfCommand.ExecuteNonQuery.cs
@@ -4,10 +4,18 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
     {
         #region ExecuteNonQuery
 
+=======
+    public partial class CfCommand : IDisposable
+    {
+        #region ExecuteNonQuery
+
+        //[System.Diagnostics.DebuggerStepThrough]
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)
         {
             Logger.Debug("Begin Method");
@@ -35,12 +43,15 @@ public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<Cf
             }
         }
 
+<<<<<<< HEAD
         public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return ExecuteNonQuery(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         #endregion
     }
 }
diff --git a/src/CfCommand.ExecuteReader.cs b/src/CfCommand.ExecuteReader.cs
@@ -6,7 +6,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region ExecuteReader
 
@@ -38,8 +42,52 @@ public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, IEnumera
 
         public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, object cmdParms)
         {
+<<<<<<< HEAD
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return ExecuteReader(cmdType, cmdText, cfParams);
+=======
+            try
+            {
+                IList<CfParameter> cfParams = null;
+                if (cmdParms != null)
+                {
+                    if (!(cmdParms is IEnumerable<CfParameter>))
+                    {
+
+                        var props = cmdParms as ExpandoObject as IDictionary<string, object>;
+                        if (props != null)
+                        {
+                            cfParams = new List<CfParameter>(props.Count());
+                            foreach (var p in props)
+                            {
+                                cfParams.Add(new CfParameter(p.Key, p.Value));
+                            }
+                        }
+                        else
+                        {
+                            var properties = cmdParms.GetType().GetProperties();
+                            if (properties.Any())
+                            {
+                                cfParams = new List<CfParameter>(properties.Count());
+                                foreach (var property in properties)
+                                {
+                                    cfParams.Add(new CfParameter(property.Name, property.GetValue(cmdParms, null)));
+                                }
+                            }
+                        }
+                    }
+                }
+
+                _conn.EstablishFactoryConnection();
+                PrepareCommand(cmdType, cmdText, cfParams);
+                return _cmd.ExecuteReader(CommandBehavior.CloseConnection);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error(ex);
+                throw new CfException("Unknown Error (Connection Factory: ExecuteReader) " + ex.Message, ex);
+            }
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         }
 
         #endregion
diff --git a/src/CfCommand.ExecuteScalar.cs b/src/CfCommand.ExecuteScalar.cs
@@ -3,7 +3,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region ExecuteScalar
 
@@ -39,11 +43,14 @@ public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, IEnumerable<CfP
                 throw new CfException("Unknown Error (Connection Factory: ExecuteScalar) " + ex.Message, ex);
             }
         }
+<<<<<<< HEAD
         public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return ExecuteScalar<T>(cmdType, cmdText, cfParams);
         }
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
 
         public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)
         {
@@ -59,12 +66,15 @@ public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<
 
             return returnValue;
         }
+<<<<<<< HEAD
         public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return ExecuteScalar(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
 
         #endregion
     }
diff --git a/src/CfCommand.LazyLoad.cs b/src/CfCommand.LazyLoad.cs
@@ -4,7 +4,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region LazyLoad
 
@@ -33,12 +37,15 @@ public IEnumerable<IDataReader> LazyLoad(CfCommandType cmdType, string cmdText,
             }
         }
 
+<<<<<<< HEAD
         public IEnumerable<IDataReader> LazyLoad(CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return LazyLoad(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         #endregion
     }
 }
diff --git a/src/CfCommand.LazyLoadForObjects.cs b/src/CfCommand.LazyLoadForObjects.cs
@@ -4,7 +4,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region LazyLoadForObjects
 
@@ -23,13 +27,16 @@ public IEnumerable<T> LazyLoadForObjects<T>(
             return LazyLoadForObjects<T>(LazyLoad(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public IEnumerable<T> LazyLoadForObjects<T>(
             CfCommandType cmdType, string cmdText, object cmdParms) where T : new()
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return LazyLoadForObjects<T>(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         /// <summary>
         /// LazyLoadForObjects Performs and returns the list loaded entities
         /// </summary>
@@ -89,13 +96,16 @@ public IEnumerable<dynamic> LazyLoadForObjects(
             return LazyLoadForObjects(LazyLoad(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public IEnumerable<dynamic> LazyLoadForObjects(
             CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return LazyLoadForObjects(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         public static IEnumerable<dynamic> LazyLoadForObjects(IEnumerable<IDataReader> dr)
         {
             using (var enumerator = dr.GetEnumerator())
diff --git a/src/CfCommand.QueryForList.cs b/src/CfCommand.QueryForList.cs
@@ -4,7 +4,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region QueryForList
 
@@ -23,13 +27,16 @@ public IList<T> QueryForList<T>(
             return QueryForList<T>(ExecuteReader(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public IList<T> QueryForList<T>(
             CfCommandType cmdType, string cmdText, object cmdParms) where T : new()
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return QueryForList<T>(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         /// <summary>
         /// Datareader Performs and returns the list loaded entities
         /// </summary>
@@ -103,13 +110,16 @@ public IList<dynamic> QueryForList(
             return QueryForList(ExecuteReader(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public IList<dynamic> QueryForList(
             CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return QueryForList(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         /// <summary>
         /// Datareader Performs and returns the list loaded entities
         /// </summary>
diff --git a/src/CfCommand.QueryForObject.cs b/src/CfCommand.QueryForObject.cs
@@ -4,7 +4,11 @@
 
 namespace ConnectionFactory
 {
+<<<<<<< HEAD
     public partial class CfCommand
+=======
+    public partial class CfCommand : IDisposable
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region QueryForObject
 
@@ -23,13 +27,16 @@ public T QueryForObject<T>(CfCommandType cmdType, string cmdText,
             return QueryForObject<T>(ExecuteReader(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public T QueryForObject<T>(CfCommandType cmdType, string cmdText,
             object cmdParms) where T : new()
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return QueryForObject<T>(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         /// <summary>
         /// Performs datareader and returns loaded entity
         /// </summary>
@@ -96,13 +103,16 @@ public dynamic QueryForObject(
             return QueryForObject(ExecuteReader(cmdType, cmdText, cmdParms));
         }
 
+<<<<<<< HEAD
         public dynamic QueryForObject(
             CfCommandType cmdType, string cmdText, object cmdParms)
         {
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return QueryForObject(cmdType, cmdText, cfParams);
         }
 
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
         public static dynamic QueryForObject(IDataReader dr)
         {
             return dr.Read() ? dr.ToExpando() : null;
diff --git a/src/CfCommand.cs b/src/CfCommand.cs
@@ -3,8 +3,11 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+<<<<<<< HEAD
 using System.Dynamic;
 using System.Linq;
+=======
+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
 
 namespace ConnectionFactory
 {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,11 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
	`7`	`+<<<<<<< HEAD`
`7`	`8`	`public partial class CfCommand`
	`9`	`+=======`
	`10`	`+ public partial class CfCommand : IDisposable`
	`11`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`8`	`12`	`{`
`9`	`13`	`#region DataAdapter`
`10`	`14`
`@@ -42,12 +46,15 @@ public DataSet DataAdapter(CfCommandType cmdType, string cmdText, IEnumerable<Cf`
`42`	`46`	`}`
`43`	`47`	`}`
`44`	`48`
	`49`	`+<<<<<<< HEAD`
`45`	`50`	`public DataSet DataAdapter(CfCommandType cmdType, string cmdText, object cmdParms)`
`46`	`51`	`{`
`47`	`52`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`48`	`53`	`return DataAdapter(cmdType, cmdText, cfParams);`
`49`	`54`	`}`
`50`	`55`
	`56`	`+=======`
	`57`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`51`	`58`	`#endregion`
`52`	`59`	`}`
`53`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,18 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
	`7`	`+<<<<<<< HEAD`
`7`	`8`	`public partial class CfCommand`
`8`	`9`	`{`
`9`	`10`	`#region ExecuteNonQuery`
`10`	`11`
	`12`	`+=======`
	`13`	`+ public partial class CfCommand : IDisposable`
	`14`	`+ {`
	`15`	`+ #region ExecuteNonQuery`
	`16`	`+`
	`17`	`+ //[System.Diagnostics.DebuggerStepThrough]`
	`18`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`11`	`19`	`public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)`
`12`	`20`	`{`
`13`	`21`	`Logger.Debug("Begin Method");`
`@@ -35,12 +43,15 @@ public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<Cf`
`35`	`43`	`}`
`36`	`44`	`}`
`37`	`45`
	`46`	`+<<<<<<< HEAD`
`38`	`47`	`public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, object cmdParms)`
`39`	`48`	`{`
`40`	`49`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`41`	`50`	`return ExecuteNonQuery(cmdType, cmdText, cfParams);`
`42`	`51`	`}`
`43`	`52`
	`53`	`+=======`
	`54`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`44`	`55`	`#endregion`
`45`	`56`	`}`
`46`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,11 @@`
`3`	`3`
`4`	`4`	`namespace ConnectionFactory`
`5`	`5`	`{`
	`6`	`+<<<<<<< HEAD`
`6`	`7`	`public partial class CfCommand`
	`8`	`+=======`
	`9`	`+ public partial class CfCommand : IDisposable`
	`10`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`7`	`11`	`{`
`8`	`12`	`#region ExecuteScalar`
`9`	`13`
`@@ -39,11 +43,14 @@ public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, IEnumerable<CfP`
`39`	`43`	`throw new CfException("Unknown Error (Connection Factory: ExecuteScalar) " + ex.Message, ex);`
`40`	`44`	`}`
`41`	`45`	`}`
	`46`	`+<<<<<<< HEAD`
`42`	`47`	`public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, object cmdParms)`
`43`	`48`	`{`
`44`	`49`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`45`	`50`	`return ExecuteScalar<T>(cmdType, cmdText, cfParams);`
`46`	`51`	`}`
	`52`	`+=======`
	`53`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`47`	`54`
`48`	`55`	`public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)`
`49`	`56`	`{`
`@@ -59,12 +66,15 @@ public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<`
`59`	`66`
`60`	`67`	`return returnValue;`
`61`	`68`	`}`
	`69`	`+<<<<<<< HEAD`
`62`	`70`	`public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, object cmdParms)`
`63`	`71`	`{`
`64`	`72`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`65`	`73`	`return ExecuteScalar(cmdType, cmdText, cfParams);`
`66`	`74`	`}`
`67`	`75`
	`76`	`+=======`
	`77`	`+>>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`68`	`78`
`69`	`79`	`#endregion`
`70`	`80`	`}`