merge execution files and add transactions support for all methods

Author: ahmad-moussawi

QueryBuilder.Tests/AggregateTests.cs

@@ -22,7 +22,7 @@ public void Count()
         [Fact]
         public void CountMultipleColumns()
         {
-            var query = new Query("A").AsCount("ColumnA", "ColumnB");
+            var query = new Query("A").AsCount(new[] { "ColumnA", "ColumnB" });
 
             var c = Compile(query);
 
@@ -42,7 +42,7 @@ public void DistinctCount()
         [Fact]
         public void DistinctCountMultipleColumns()
         {
-            var query = new Query("A").Distinct().AsCount("ColumnA", "ColumnB");
+            var query = new Query("A").Distinct().AsCount(new[] { "ColumnA", "ColumnB" });
 
             var c = Compile(query);
 

QueryBuilder/Query.Aggregate.cs

@@ -1,10 +1,11 @@
+using System.Collections.Generic;
 using System.Linq;
 
 namespace SqlKata
 {
     public partial class Query
     {
-        public Query AsAggregate(string type, params string[] columns)
+        public Query AsAggregate(string type, string[] columns = null)
         {
 
             Method = "aggregate";
@@ -13,15 +14,15 @@ public Query AsAggregate(string type, params string[] columns)
             .AddComponent("aggregate", new AggregateClause
             {
                 Type = type,
-                Columns = columns.ToList()
+                Columns = columns?.ToList() ?? new List<string>(),
             });
 
             return this;
         }
 
-        public Query AsCount(params string[] columns)
+        public Query AsCount(string[] columns = null)
         {
-            var cols = columns.ToList();
+            var cols = columns?.ToList() ?? new List<string> { };
 
             if (!cols.Any())
             {
@@ -33,7 +34,7 @@ public Query AsCount(params string[] columns)
 
         public Query AsAvg(string column)
         {
-            return AsAggregate("avg", column);
+            return AsAggregate("avg", new string[] { column });
         }
         public Query AsAverage(string column)
         {
@@ -42,17 +43,17 @@ public Query AsAverage(string column)
 
         public Query AsSum(string column)
         {
-            return AsAggregate("sum", column);
+            return AsAggregate("sum", new[] { column });
         }
 
         public Query AsMax(string column)
         {
-            return AsAggregate("max", column);
+            return AsAggregate("max", new[] { column });
         }
 
         public Query AsMin(string column)
         {
-            return AsAggregate("min", column);
+            return AsAggregate("min", new[] { column });
         }
     }
 }

SqlKata.Execution/Helper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Threading.Tasks;
-using SqlKata;
 
 namespace SqlKata.Execution
 {
@@ -66,29 +66,29 @@ public Query NextQuery()
             return this.Query.ForPage(Page + 1, PerPage);
         }
 
-        public PaginationResult<T> Next()
+        public PaginationResult<T> Next(IDbTransaction transaction = null, int? timeout = null)
         {
-            return this.Query.Paginate<T>(Page + 1, PerPage);
+            return this.Query.Paginate<T>(Page + 1, PerPage, transaction, timeout);
         }
 
-        public async Task<PaginationResult<T>> NextAsync()
+        public async Task<PaginationResult<T>> NextAsync(IDbTransaction transaction = null, int? timeout = null)
         {
-            return await this.Query.PaginateAsync<T>(Page + 1, PerPage);
+            return await this.Query.PaginateAsync<T>(Page + 1, PerPage, transaction, timeout);
         }
 
         public Query PreviousQuery()
         {
             return this.Query.ForPage(Page - 1, PerPage);
         }
 
-        public PaginationResult<T> Previous()
+        public PaginationResult<T> Previous(IDbTransaction transaction = null, int? timeout = null)
         {
-            return this.Query.Paginate<T>(Page - 1, PerPage);
+            return this.Query.Paginate<T>(Page - 1, PerPage, transaction, timeout);
         }
 
-        public async Task<PaginationResult<T>> PreviousAsync()
+        public async Task<PaginationResult<T>> PreviousAsync(IDbTransaction transaction = null, int? timeout = null)
         {
-            return await this.Query.PaginateAsync<T>(Page - 1, PerPage);
+            return await this.Query.PaginateAsync<T>(Page - 1, PerPage, transaction, timeout);
         }
 
         public PaginationIterator<T> Each