Fix merge

afernandes · afernandes · commit 2f1c4084ecce · 2017-08-25T07:46:39.000-03:00
diff --git a/src/CfCommand.DataAdapter.cs b/src/CfCommand.DataAdapter.cs
@@ -4,14 +4,9 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region DataAdapter
-
         /// <summary>
         /// DataAdapter Performs and returns the DataSet
         /// </summary>
@@ -45,16 +40,11 @@ public DataSet DataAdapter(CfCommandType cmdType, string cmdText, IEnumerable<Cf
                 throw new CfException("Unknown Error (Connection Factory: DataAdapter) " + ex.Message, ex);
             }
         }
-
-<<<<<<< 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,18 +4,10 @@
 
 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");
@@ -42,16 +34,12 @@ public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<Cf
                 throw new CfException("Error on Connection Factory Mechanism: " + ex.Message, ex);
             }
         }
-
-<<<<<<< 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,14 +6,9 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region ExecuteReader
-
         /// <summary>
         /// Performs datareader
         /// </summary>
@@ -39,13 +34,10 @@ public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, IEnumera
                 throw new CfException("Unknown Error (Connection Factory: ExecuteReader) " + ex.Message, ex);
             }
         }
-
         public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, object cmdParms)
         {
-<<<<<<< HEAD
             var cfParams = ConvertObjectToCfParameters(cmdParms);
             return ExecuteReader(cmdType, cmdText, cfParams);
-=======
             try
             {
                 IList<CfParameter> cfParams = null;
@@ -87,9 +79,7 @@ public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, object c
                 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,14 +3,9 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region ExecuteScalar
-
         [System.Diagnostics.DebuggerStepThrough]
         public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)
         {
@@ -43,14 +38,11 @@ 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)
         {
@@ -66,16 +58,11 @@ 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,14 +4,10 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
+
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region LazyLoad
-
         /// <summary>
         /// Performs LazyLoad
         /// </summary>
@@ -36,16 +32,11 @@ 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,11 +4,7 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region LazyLoadForObjects
 
@@ -27,16 +23,13 @@ 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>
@@ -96,16 +89,13 @@ 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,11 +4,7 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region QueryForList
 
@@ -27,16 +23,13 @@ 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>
@@ -110,16 +103,13 @@ 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,11 +4,7 @@
 
 namespace ConnectionFactory
 {
-<<<<<<< HEAD
     public partial class CfCommand
-=======
-    public partial class CfCommand : IDisposable
->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79
     {
         #region QueryForObject
 
@@ -27,16 +23,13 @@ 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>
@@ -103,16 +96,13 @@ 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,11 +3,8 @@
 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,14 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
`7`		`-<<<<<<< HEAD`
`8`	`7`	`public partial class CfCommand`
`9`		`-=======`
`10`		`- public partial class CfCommand : IDisposable`
`11`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`12`	`8`	`{`
`13`	`9`	`#region DataAdapter`
`14`		`-`
`15`	`10`	`/// <summary>`
`16`	`11`	`/// DataAdapter Performs and returns the DataSet`
`17`	`12`	`/// </summary>`
`@@ -45,16 +40,11 @@ public DataSet DataAdapter(CfCommandType cmdType, string cmdText, IEnumerable<Cf`
`45`	`40`	`throw new CfException("Unknown Error (Connection Factory: DataAdapter) " + ex.Message, ex);`
`46`	`41`	`}`
`47`	`42`	`}`
`48`		`-`
`49`		`-<<<<<<< HEAD`
`50`	`43`	`public DataSet DataAdapter(CfCommandType cmdType, string cmdText, object cmdParms)`
`51`	`44`	`{`
`52`	`45`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`53`	`46`	`return DataAdapter(cmdType, cmdText, cfParams);`
`54`	`47`	`}`
`55`		`-`
`56`		`-=======`
`57`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`58`	`48`	`#endregion`
`59`	`49`	`}`
`60`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
`7`		`-<<<<<<< HEAD`
`8`	`7`	`public partial class CfCommand`
`9`	`8`	`{`
`10`	`9`	`#region ExecuteNonQuery`
`11`		`-`
`12`		`-=======`
`13`		`- public partial class CfCommand : IDisposable`
`14`		`- {`
`15`		`- #region ExecuteNonQuery`
`16`		`-`
`17`	`10`	`//[System.Diagnostics.DebuggerStepThrough]`
`18`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`19`	`11`	`public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)`
`20`	`12`	`{`
`21`	`13`	`Logger.Debug("Begin Method");`
`@@ -42,16 +34,12 @@ public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, IEnumerable<Cf`
`42`	`34`	`throw new CfException("Error on Connection Factory Mechanism: " + ex.Message, ex);`
`43`	`35`	`}`
`44`	`36`	`}`
`45`		`-`
`46`		`-<<<<<<< HEAD`
`47`	`37`	`public int ExecuteNonQuery(CfCommandType cmdType, string cmdText, object cmdParms)`
`48`	`38`	`{`
`49`	`39`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`50`	`40`	`return ExecuteNonQuery(cmdType, cmdText, cfParams);`
`51`	`41`	`}`
`52`		`-`
`53`		`-=======`
`54`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`55`	`42`	`#endregion`
`56`	`43`	`}`
`57`		`-}`
	`44`	`+`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,9 @@`
`6`	`6`
`7`	`7`	`namespace ConnectionFactory`
`8`	`8`	`{`
`9`		`-<<<<<<< HEAD`
`10`	`9`	`public partial class CfCommand`
`11`		`-=======`
`12`		`- public partial class CfCommand : IDisposable`
`13`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`14`	`10`	`{`
`15`	`11`	`#region ExecuteReader`
`16`		`-`
`17`	`12`	`/// <summary>`
`18`	`13`	`/// Performs datareader`
`19`	`14`	`/// </summary>`
`@@ -39,13 +34,10 @@ public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, IEnumera`
`39`	`34`	`throw new CfException("Unknown Error (Connection Factory: ExecuteReader) " + ex.Message, ex);`
`40`	`35`	`}`
`41`	`36`	`}`
`42`		`-`
`43`	`37`	`public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, object cmdParms)`
`44`	`38`	`{`
`45`		`-<<<<<<< HEAD`
`46`	`39`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`47`	`40`	`return ExecuteReader(cmdType, cmdText, cfParams);`
`48`		`-=======`
`49`	`41`	`try`
`50`	`42`	`{`
`51`	`43`	`IList<CfParameter> cfParams = null;`
`@@ -87,9 +79,7 @@ public IDataReader ExecuteReader(CfCommandType cmdType, string cmdText, object c`
`87`	`79`	`Logger.Error(ex);`
`88`	`80`	`throw new CfException("Unknown Error (Connection Factory: ExecuteReader) " + ex.Message, ex);`
`89`	`81`	`}`
`90`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`91`	`82`	`}`
`92`		`-`
`93`	`83`	`#endregion`
`94`	`84`	`}`
`95`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace ConnectionFactory`
`5`	`5`	`{`
`6`		`-<<<<<<< HEAD`
`7`	`6`	`public partial class CfCommand`
`8`		`-=======`
`9`		`- public partial class CfCommand : IDisposable`
`10`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`11`	`7`	`{`
`12`	`8`	`#region ExecuteScalar`
`13`		`-`
`14`	`9`	`[System.Diagnostics.DebuggerStepThrough]`
`15`	`10`	`public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)`
`16`	`11`	`{`
`@@ -43,14 +38,11 @@ public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, IEnumerable<CfP`
`43`	`38`	`throw new CfException("Unknown Error (Connection Factory: ExecuteScalar) " + ex.Message, ex);`
`44`	`39`	`}`
`45`	`40`	`}`
`46`		`-<<<<<<< HEAD`
`47`	`41`	`public T ExecuteScalar<T>(CfCommandType cmdType, string cmdText, object cmdParms)`
`48`	`42`	`{`
`49`	`43`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`50`	`44`	`return ExecuteScalar<T>(cmdType, cmdText, cfParams);`
`51`	`45`	`}`
`52`		`-=======`
`53`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`54`	`46`
`55`	`47`	`public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<CfParameter> cmdParms = null)`
`56`	`48`	`{`
`@@ -66,16 +58,11 @@ public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, IEnumerable<`
`66`	`58`
`67`	`59`	`return returnValue;`
`68`	`60`	`}`
`69`		`-<<<<<<< HEAD`
`70`	`61`	`public dynamic ExecuteScalar(CfCommandType cmdType, string cmdText, object cmdParms)`
`71`	`62`	`{`
`72`	`63`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`73`	`64`	`return ExecuteScalar(cmdType, cmdText, cfParams);`
`74`	`65`	`}`
`75`		`-`
`76`		`-=======`
`77`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`78`		`-`
`79`	`66`	`#endregion`
`80`	`67`	`}`
`81`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
`7`		`-<<<<<<< HEAD`
	`7`	`+`
`8`	`8`	`public partial class CfCommand`
`9`		`-=======`
`10`		`- public partial class CfCommand : IDisposable`
`11`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`12`	`9`	`{`
`13`	`10`	`#region LazyLoad`
`14`		`-`
`15`	`11`	`/// <summary>`
`16`	`12`	`/// Performs LazyLoad`
`17`	`13`	`/// </summary>`
`@@ -36,16 +32,11 @@ public IEnumerable<IDataReader> LazyLoad(CfCommandType cmdType, string cmdText,`
`36`	`32`	`}`
`37`	`33`	`}`
`38`	`34`	`}`
`39`		`-`
`40`		`-<<<<<<< HEAD`
`41`	`35`	`public IEnumerable<IDataReader> LazyLoad(CfCommandType cmdType, string cmdText, object cmdParms)`
`42`	`36`	`{`
`43`	`37`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`44`	`38`	`return LazyLoad(cmdType, cmdText, cfParams);`
`45`	`39`	`}`
`46`		`-`
`47`		`-=======`
`48`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`49`	`40`	`#endregion`
`50`	`41`	`}`
`51`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace ConnectionFactory`
`6`	`6`	`{`
`7`		`-<<<<<<< HEAD`
`8`	`7`	`public partial class CfCommand`
`9`		`-=======`
`10`		`- public partial class CfCommand : IDisposable`
`11`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`12`	`8`	`{`
`13`	`9`	`#region LazyLoadForObjects`
`14`	`10`
`@@ -27,16 +23,13 @@ public IEnumerable<T> LazyLoadForObjects<T>(`
`27`	`23`	`return LazyLoadForObjects<T>(LazyLoad(cmdType, cmdText, cmdParms));`
`28`	`24`	`}`
`29`	`25`
`30`		`-<<<<<<< HEAD`
`31`	`26`	`public IEnumerable<T> LazyLoadForObjects<T>(`
`32`	`27`	`CfCommandType cmdType, string cmdText, object cmdParms) where T : new()`
`33`	`28`	`{`
`34`	`29`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`35`	`30`	`return LazyLoadForObjects<T>(cmdType, cmdText, cfParams);`
`36`	`31`	`}`
`37`		`-`
`38`		`-=======`
`39`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
	`32`	`+`
`40`	`33`	`/// <summary>`
`41`	`34`	`/// LazyLoadForObjects Performs and returns the list loaded entities`
`42`	`35`	`/// </summary>`
`@@ -96,16 +89,13 @@ public IEnumerable<dynamic> LazyLoadForObjects(`
`96`	`89`	`return LazyLoadForObjects(LazyLoad(cmdType, cmdText, cmdParms));`
`97`	`90`	`}`
`98`	`91`
`99`		`-<<<<<<< HEAD`
`100`	`92`	`public IEnumerable<dynamic> LazyLoadForObjects(`
`101`	`93`	`CfCommandType cmdType, string cmdText, object cmdParms)`
`102`	`94`	`{`
`103`	`95`	`var cfParams = ConvertObjectToCfParameters(cmdParms);`
`104`	`96`	`return LazyLoadForObjects(cmdType, cmdText, cfParams);`
`105`	`97`	`}`
`106`	`98`
`107`		`-=======`
`108`		`->>>>>>> ba793c7ae09df0e7280087f86968eb9435428a79`
`109`	`99`	`public static IEnumerable<dynamic> LazyLoadForObjects(IEnumerable<IDataReader> dr)`
`110`	`100`	`{`
`111`	`101`	`using (var enumerator = dr.GetEnumerator())`