Insert, Update & Having values argument now accepts dynamic, ExpandoObject & any implementation of IEnumerable<KeyValuePair<string, object>>

Author: snalesso

QueryBuilder/Base.Where.cs

@@ -77,7 +77,7 @@ public Q Where(object constraints)
             return Where(dictionary);
         }
 
-        public Q Where(IReadOnlyDictionary<string, object> values)
+        public Q Where(IEnumerable<KeyValuePair<string, object>> values)
         {
             var query = (Q)this;
             var orFlag = GetOr();

QueryBuilder/Query.Having.cs

@@ -77,7 +77,7 @@ public Query Having(object constraints)
             return Having(dictionary);
         }
 
-        public Query Having(IReadOnlyDictionary<string, object> values)
+        public Query Having(IEnumerable<KeyValuePair<string, object>> values)
         {
             var query = this;
             var orFlag = GetOr();

QueryBuilder/Query.Insert.cs

@@ -9,7 +9,7 @@ public partial class Query
     {
         public Query AsInsert(object data, bool returnId = false)
         {
-            var dictionary = BuildDictionaryFromObject(data);
+            var dictionary = BuildKeyValuePairsFromObject(data);
 
             return AsInsert(dictionary, returnId);
         }
@@ -42,7 +42,7 @@ public Query AsInsert(IEnumerable<string> columns, IEnumerable<object> values)
 
         public Query AsInsert(IEnumerable<KeyValuePair<string, object>> data, bool returnId = false)
         {
-            if (data == null || data.Count == 0)
+            if (data == null || data.Any() == false)
             {
                 throw new InvalidOperationException("Values dictionary cannot be null or empty");
             }
@@ -51,8 +51,8 @@ public Query AsInsert(IEnumerable<KeyValuePair<string, object>> data, bool retur
 
             ClearComponent("insert").AddComponent("insert", new InsertClause
             {
-                Columns = data.Keys.ToList(),
-                Values = data.Values.ToList(),
+                Columns = data.Select(x=>x.Key).ToList(),
+                Values = data.Select(x => x.Value).ToList(),
                 ReturnId = returnId,
             });
 

QueryBuilder/Query.Update.cs

@@ -11,7 +11,7 @@ public partial class Query
 
         public Query AsUpdate(object data)
         {
-            var dictionary = BuildDictionaryFromObject(data, considerKeys: true);
+            var dictionary = BuildKeyValuePairsFromObject(data, considerKeys: true);
 
             return AsUpdate(dictionary);
         }
@@ -40,10 +40,10 @@ public Query AsUpdate(IEnumerable<string> columns, IEnumerable<object> values)
             return this;
         }
 
-        public Query AsUpdate(IReadOnlyDictionary<string, object> data)
+        public Query AsUpdate(IEnumerable<KeyValuePair<string, object>> data)
         {
 
-            if (data == null || data.Count == 0)
+            if (data == null || data.Any() == false)
             {
                 throw new InvalidOperationException("Values dictionary cannot be null or empty");
             }
@@ -52,8 +52,8 @@ public Query AsUpdate(IReadOnlyDictionary<string, object> data)
 
             ClearComponent("update").AddComponent("update", new InsertClause
             {
-                Columns = data.Keys.ToList(),
-                Values = data.Values.ToList(),
+                Columns = data.Select(x => x.Key).ToList(),
+                Values = data.Select(x => x.Value).ToList(),
             });
 
             return this;

QueryBuilder/Query.cs

@@ -353,7 +353,7 @@ public object FindVariable(string variable)
         /// and add it automatically to the Where clause
         /// </param>
         /// <returns></returns>
-        private Dictionary<string, object> BuildDictionaryFromObject(object data, bool considerKeys = false)
+        private IEnumerable<KeyValuePair<string, object>> BuildKeyValuePairsFromObject(object data, bool considerKeys = false)
         {
 
             var dictionary = new Dictionary<string, object>();

SqlKata.Execution/Query.Extensions.cs

@@ -153,12 +153,12 @@ public static async Task ChunkAsync(this Query query, int chunkSize, Action<IEnu
             await ChunkAsync<dynamic>(query, chunkSize, action, transaction, timeout);
         }
 
-        public static int Insert(this Query query, IReadOnlyDictionary<string, object> values, IDbTransaction transaction = null, int? timeout = null)
+        public static int Insert(this Query query, IEnumerable<KeyValuePair<string, object>> values, IDbTransaction transaction = null, int? timeout = null)
         {
             return CreateQueryFactory(query).Execute(query.AsInsert(values), transaction, timeout);
         }
 
-        public static async Task<int> InsertAsync(this Query query, IReadOnlyDictionary<string, object> values, IDbTransaction transaction = null, int? timeout = null)
+        public static async Task<int> InsertAsync(this Query query, IEnumerable<KeyValuePair<string, object>> values, IDbTransaction transaction = null, int? timeout = null)
         {
             return await CreateQueryFactory(query).ExecuteAsync(query.AsInsert(values), transaction, timeout);
         }
@@ -205,26 +205,26 @@ public static async Task<T> InsertGetIdAsync<T>(this Query query, object data, I
             return row.Id;
         }
 
-        public static T InsertGetId<T>(this Query query, IReadOnlyDictionary<string, object> data, IDbTransaction transaction = null, int? timeout = null)
+        public static T InsertGetId<T>(this Query query, IEnumerable<KeyValuePair<string, object>> data, IDbTransaction transaction = null, int? timeout = null)
         {
             var row = CreateQueryFactory(query).First<InsertGetIdRow<T>>(query.AsInsert(data, true), transaction, timeout);
 
             return row.Id;
         }
 
-        public static async Task<T> InsertGetIdAsync<T>(this Query query, IReadOnlyDictionary<string, object> data, IDbTransaction transaction = null, int? timeout = null)
+        public static async Task<T> InsertGetIdAsync<T>(this Query query, IEnumerable<KeyValuePair<string, object>> data, IDbTransaction transaction = null, int? timeout = null)
         {
             var row = await CreateQueryFactory(query).FirstAsync<InsertGetIdRow<T>>(query.AsInsert(data, true), transaction, timeout);
 
             return row.Id;
         }
 
-        public static int Update(this Query query, IReadOnlyDictionary<string, object> values, IDbTransaction transaction = null, int? timeout = null)
+        public static int Update(this Query query, IEnumerable<KeyValuePair<string, object>> values, IDbTransaction transaction = null, int? timeout = null)
         {
             return CreateQueryFactory(query).Execute(query.AsUpdate(values), transaction, timeout);
         }
 
-        public static async Task<int> UpdateAsync(this Query query, IReadOnlyDictionary<string, object> values, IDbTransaction transaction = null, int? timeout = null)
+        public static async Task<int> UpdateAsync(this Query query, IEnumerable<KeyValuePair<string, object>> values, IDbTransaction transaction = null, int? timeout = null)
         {
             return await CreateQueryFactory(query).ExecuteAsync(query.AsUpdate(values), transaction, timeout);
         }