Delete command filter (#647)

Author: hugoj-goncalves

src/ServiceStack.OrmLite/Expressions/WriteExpressionCommandExtensions.cs

@@ -371,17 +371,17 @@ internal static IDbCommand InitInsertOnly<T>(this IDbCommand dbCmd, Expression<F
             return dbCmd;
         }
 
-        public static int Delete<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> where)
+        public static int Delete<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> where, Action<IDbCommand> commandFilter = null)
         {
             var ev = dbCmd.GetDialectProvider().SqlExpression<T>();
             ev.Where(where);
-            return dbCmd.Delete(ev);
+            return dbCmd.Delete(ev, commandFilter);
         }
 
-        public static int Delete<T>(this IDbCommand dbCmd, SqlExpression<T> where)
+        public static int Delete<T>(this IDbCommand dbCmd, SqlExpression<T> where, Action<IDbCommand> commandFilter = null)
         {
             var sql = where.ToDeleteRowStatement();
-            return dbCmd.ExecuteSql(sql, where.Params);
+            return dbCmd.ExecuteSql(sql, where.Params, commandFilter);
         }
 
         public static int DeleteWhere<T>(this IDbCommand dbCmd, string whereFilter, object[] whereParams)

src/ServiceStack.OrmLite/OrmLiteWriteApi.cs

@@ -213,9 +213,9 @@ public static int UpdateAll<T>(this IDbConnection dbConn, IEnumerable<T> objs, A
         /// <para>db.Delete&lt;Person&gt;(new { FirstName = "Jimi", Age = 27 })</para>
         /// </summary>
         /// <returns>number of rows deleted</returns>
-        public static int Delete<T>(this IDbConnection dbConn, object anonFilter)
+        public static int Delete<T>(this IDbConnection dbConn, object anonFilter, Action<IDbCommand> commandFilter = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.Delete<T>(anonFilter));
+            return dbConn.Exec(dbCmd => dbCmd.Delete<T>(anonFilter, commandFilter));
         }
 
         /// <summary>
@@ -233,9 +233,9 @@ public static int Delete<T>(this IDbConnection dbConn, Dictionary<string, object
         /// <para>db.Delete(new Person { Id = 1, FirstName = "Jimi", LastName = "Hendrix", Age = 27 })</para>
         /// </summary>
         /// <returns>number of rows deleted</returns>
-        public static int Delete<T>(this IDbConnection dbConn, T allFieldsFilter)
+        public static int Delete<T>(this IDbConnection dbConn, T allFieldsFilter, Action<IDbCommand> commandFilter = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.Delete(allFieldsFilter));
+            return dbConn.Exec(dbCmd => dbCmd.Delete(allFieldsFilter, commandFilter));
         }
 
         /// <summary>
@@ -273,9 +273,9 @@ public static int DeleteNonDefaults<T>(this IDbConnection dbConn, params T[] non
         /// <para>db.DeleteById&lt;Person&gt;(1)</para>
         /// </summary>
         /// <returns>number of rows deleted</returns>
-        public static int DeleteById<T>(this IDbConnection dbConn, object id)
+        public static int DeleteById<T>(this IDbConnection dbConn, object id, Action<IDbCommand> commandFilter = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.DeleteById<T>(id));
+            return dbConn.Exec(dbCmd => dbCmd.DeleteById<T>(id, commandFilter));
         }
 
         /// <summary>
@@ -284,9 +284,9 @@ public static int DeleteById<T>(this IDbConnection dbConn, object id)
         /// row does not exist or has a different row version.
         /// E.g: <para>db.DeleteById&lt;Person&gt;(1)</para>
         /// </summary>
-        public static void DeleteById<T>(this IDbConnection dbConn, object id, ulong rowVersion)
+        public static void DeleteById<T>(this IDbConnection dbConn, object id, ulong rowVersion, Action<IDbCommand> commandFilter = null)
         {
-            dbConn.Exec(dbCmd => dbCmd.DeleteById<T>(id, rowVersion));
+            dbConn.Exec(dbCmd => dbCmd.DeleteById<T>(id, rowVersion, commandFilter));
         }
 
         /// <summary>

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -257,12 +257,14 @@ internal static string LastSql(this IDbCommand dbCmd)
             return dbCmd.CommandText;
         }
 
-        internal static int ExecuteSql(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams = null)
+        internal static int ExecuteSql(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams = null, Action<IDbCommand> commandFilter = null)
         {
             dbCmd.CommandText = sql;
 
             dbCmd.SetParameters(sqlParams);
 
+            commandFilter?.Invoke(dbCmd);
+
             if (Log.IsDebugEnabled)
                 Log.DebugCommand(dbCmd);
 
@@ -274,13 +276,15 @@ internal static int ExecuteSql(this IDbCommand dbCmd, string sql, IEnumerable<ID
             return dbCmd.ExecuteNonQuery();
         }
 
-        internal static int ExecuteSql(this IDbCommand dbCmd, string sql, object anonType)
+        internal static int ExecuteSql(this IDbCommand dbCmd, string sql, object anonType, Action<IDbCommand> commandFilter = null)
         {
             if (anonType != null)
                 dbCmd.SetParameters(anonType.ToObjectDictionary(), excludeDefaults: false, sql:ref sql);
 
             dbCmd.CommandText = sql;
 
+            commandFilter?.Invoke(dbCmd);
+
             if (Log.IsDebugEnabled)
                 Log.DebugCommand(dbCmd);
 
@@ -510,12 +514,12 @@ private static int AssertRowsUpdated(IDbCommand dbCmd, bool hadRowVersion)
             return rowsUpdated;
         }
 
-        internal static int Delete<T>(this IDbCommand dbCmd, T anonType)
+        internal static int Delete<T>(this IDbCommand dbCmd, T anonType, Action<IDbCommand> commandFilter = null)
         {
-            return dbCmd.Delete<T>((object)anonType);
+            return dbCmd.Delete<T>((object)anonType, commandFilter);
         }
 
-        internal static int Delete<T>(this IDbCommand dbCmd, object anonType)
+        internal static int Delete<T>(this IDbCommand dbCmd, object anonType, Action<IDbCommand> commandFilter = null)
         {
             var dialectProvider = dbCmd.GetDialectProvider();
 
@@ -524,6 +528,8 @@ internal static int Delete<T>(this IDbCommand dbCmd, object anonType)
 
             dialectProvider.SetParameterValues<T>(dbCmd, anonType);
 
+            commandFilter?.Invoke(dbCmd);
+
             return AssertRowsUpdated(dbCmd, hadRowVersion);
         }
 
@@ -553,7 +559,7 @@ internal static int DeleteNonDefaults<T>(this IDbCommand dbCmd, T[] filters)
             return DeleteAll(dbCmd, filters, o => o.AllFieldsMap<T>().NonDefaultsOnly());
         }
 
-        private static int DeleteAll<T>(IDbCommand dbCmd, IEnumerable<T> objs, Func<object,Dictionary<string,object>> fieldValuesFn=null)
+        private static int DeleteAll<T>(IDbCommand dbCmd, IEnumerable<T> objs, Func<object,Dictionary<string,object>> fieldValuesFn=null, Action<IDbCommand> commandFilter = null)
         {
             OrmLiteUtils.AssertNotAnonType<T>();
 
@@ -577,6 +583,9 @@ private static int DeleteAll<T>(IDbCommand dbCmd, IEnumerable<T> objs, Func<obje
 
                     dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
+                    commandFilter?.Invoke(dbCmd);
+                    commandFilter = null;
+
                     count += dbCmd.ExecNonQuery();
                 }
 
@@ -590,11 +599,11 @@ private static int DeleteAll<T>(IDbCommand dbCmd, IEnumerable<T> objs, Func<obje
             return count;
         }
 
-        internal static int DeleteById<T>(this IDbCommand dbCmd, object id)
+        internal static int DeleteById<T>(this IDbCommand dbCmd, object id, Action<IDbCommand> commandFilter = null)
         {
             var sql = DeleteByIdSql<T>(dbCmd, id);
 
-            return dbCmd.ExecuteSql(sql);
+            return dbCmd.ExecuteSql(sql, commandFilter: commandFilter);
         }
 
         internal static string DeleteByIdSql<T>(this IDbCommand dbCmd, object id)
@@ -613,11 +622,11 @@ internal static string DeleteByIdSql<T>(this IDbCommand dbCmd, object id)
             return sql;
         }
 
-        internal static void DeleteById<T>(this IDbCommand dbCmd, object id, ulong rowVersion)
+        internal static void DeleteById<T>(this IDbCommand dbCmd, object id, ulong rowVersion, Action<IDbCommand> commandFilter = null)
         {
             var sql = DeleteByIdSql<T>(dbCmd, id, rowVersion);
 
-            var rowsAffected = dbCmd.ExecuteSql(sql);
+            var rowsAffected = dbCmd.ExecuteSql(sql, commandFilter: commandFilter);
             if (rowsAffected == 0)
                 throw new OptimisticConcurrencyException("The row was modified or deleted since the last read");
         }

src/ServiceStack.OrmLite/OrmLiteWriteExpressionsApi.cs

@@ -248,9 +248,9 @@ public static long InsertOnly<T>(this IDbConnection dbConn, Expression<Func<T>>
         ///   db.Delete&lt;Person&gt;(p => p.Age == 27);
         ///   DELETE FROM "Person" WHERE ("Age" = 27)
         /// </summary>
-        public static int Delete<T>(this IDbConnection dbConn, Expression<Func<T, bool>> where)
+        public static int Delete<T>(this IDbConnection dbConn, Expression<Func<T, bool>> where, Action<IDbCommand> commandFilter = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.Delete(where));
+            return dbConn.Exec(dbCmd => dbCmd.Delete(where, commandFilter));
         }
 
         /// <summary>
@@ -260,7 +260,7 @@ public static int Delete<T>(this IDbConnection dbConn, Expression<Func<T, bool>>
         ///   db.Delete&lt;Person&gt;(q.Where(p => p.Age == 27));
         ///   DELETE FROM "Person" WHERE ("Age" = 27)
         /// </summary>
-        public static int Delete<T>(this IDbConnection dbConn, SqlExpression<T> where)
+        public static int Delete<T>(this IDbConnection dbConn, SqlExpression<T> where, Action<IDbCommand> commandFilter = null)
         {
             return dbConn.Exec(dbCmd => dbCmd.Delete(where));
         }