Merge pull request #90 from ebalders/master-CommandTimeout

add command timeout to dapper results

Author: ithielnor

Griddly.Mvc/Results/DapperResult.cs

@@ -17,13 +17,14 @@ public abstract class DapperResult<T> : GriddlyResult<T>
         Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> _map;
         Action<IDbConnection, IDbTransaction, IList<T>> _massage;
         long? _overallCount = null;
+        int? _commandTimeout = null;
 
         protected string _outerSqlTemplate;
         protected string _sql;
         protected bool _fixedSort;
         protected static readonly bool _hasOverallCount = typeof(IHasOverallCount).IsAssignableFrom(typeof(T));
 
-        public DapperResult(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map, Action<IDbConnection, IDbTransaction, IList<T>> massage, bool fixedSort, Func<IDbTransaction> getTransaction, string outerSqlTemplate)
+        public DapperResult(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map, Action<IDbConnection, IDbTransaction, IList<T>> massage, bool fixedSort, Func<IDbTransaction> getTransaction, string outerSqlTemplate, int? commandTimout = null)
             : base(null)
         {
             _getConnection = getConnection;
@@ -39,7 +40,7 @@ public DapperResult(Func<IDbConnection> getConnection, string sql, object param,
             _massage = massage;
             _fixedSort = fixedSort;
             _getTransaction = getTransaction;
-
+            _commandTimeout = commandTimout;
         }
 
         public override void PopulateSummaryValues(GriddlySettings<T> settings)
@@ -91,7 +92,7 @@ public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortFie
                 IDbConnection cn = _getConnection();
                 IDbTransaction tx = _getTransaction != null ? _getTransaction() : null;
 
-                return cn.Query<P>(sql, _param, tx);
+                return cn.Query<P>(sql, _param, tx, commandTimeout: _commandTimeout);
             }
             catch (Exception ex)
             {
@@ -132,7 +133,7 @@ protected virtual X ExecuteSingle<X>(string sql)
             IDbConnection cn = _getConnection();
             IDbTransaction tx = _getTransaction != null ? _getTransaction() : null;
 
-            return cn.Query<X>(sql, _param, tx).Single();
+            return cn.Query<X>(sql, _param, tx, commandTimeout: _commandTimeout).Single();
         }
 
         // TODO: return IEnumerable so we don't have to .ToList()
@@ -160,7 +161,7 @@ protected virtual IList<T> ExecuteQuery(string sql)
 
         protected IEnumerable<T> DefaultMap(IDbConnection cn, IDbTransaction tx, string sql, object param)
         {
-            IEnumerable<T> result = cn.Query<T>(sql, param, tx);
+            IEnumerable<T> result = cn.Query<T>(sql, param, tx, commandTimeout: _commandTimeout);
 
             var firstRow = result.FirstOrDefault();
             long? overallCount = null;

Griddly.Mvc/Results/DapperSql2008Result.cs

@@ -10,8 +10,8 @@ namespace Griddly.Mvc.Results
 {
     public class DapperSql2008Result<T> : DapperResult<T>
     {
-        public DapperSql2008Result(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map = null, Action<IDbConnection, IDbTransaction, IList<T>> massage = null, bool fixedSort = false, Func<IDbTransaction> getTransaction = null, string outerSqlTemplate = "{0}")
-            : base(getConnection, sql, param, map, massage, fixedSort, getTransaction, outerSqlTemplate)
+        public DapperSql2008Result(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map = null, Action<IDbConnection, IDbTransaction, IList<T>> massage = null, bool fixedSort = false, Func<IDbTransaction> getTransaction = null, string outerSqlTemplate = "{0}", int? commandTimeout = null)
+            : base(getConnection, sql, param, map, massage, fixedSort, getTransaction, outerSqlTemplate, commandTimeout)
         { }
 
         public override IList<T> GetPage(int pageNumber, int pageSize, SortField[] sortFields)

Griddly.Mvc/Results/DapperSql2012Result.cs

@@ -10,8 +10,8 @@ namespace Griddly.Mvc.Results
 {
     public class DapperSql2012Result<T> : DapperResult<T>
     {
-        public DapperSql2012Result(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map = null, Action<IDbConnection, IDbTransaction, IList<T>> massage = null, bool fixedSort = false, Func<IDbTransaction> getTransaction = null, string outerSqlTemplate = "{0}")
-            : base(getConnection, sql, param, map, massage, fixedSort, getTransaction, outerSqlTemplate)
+        public DapperSql2012Result(Func<IDbConnection> getConnection, string sql, object param, Func<IDbConnection, IDbTransaction, string, object, IEnumerable<T>> map = null, Action<IDbConnection, IDbTransaction, IList<T>> massage = null, bool fixedSort = false, Func<IDbTransaction> getTransaction = null, string outerSqlTemplate = "{0}", int? commandTimeout = null)
+            : base(getConnection, sql, param, map, massage, fixedSort, getTransaction, outerSqlTemplate, commandTimeout)
         { }
 
         public override IList<T> GetPage(int pageNumber, int pageSize, SortField[] sortFields)