Revert "Execute filters after initializing CommandText"

This reverts commit d819d06.

Author: mythz

src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs

@@ -58,13 +58,14 @@ internal static Task<int> ExecuteSqlAsync(this IDbCommand dbCmd, string sql, obj
 
         internal static async Task<int> UpdateAsync<T>(this IDbCommand dbCmd, T obj, CancellationToken token, Action<IDbCommand> commandFilter)
         {
+            OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);
+
             var dialectProvider = dbCmd.GetDialectProvider();
             var hadRowVersion = dialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);
             if (string.IsNullOrEmpty(dbCmd.CommandText))
                 return 0;
 
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
-            OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);
             commandFilter?.Invoke(dbCmd);
 
             var rowsUpdated = await dialectProvider.ExecuteNonQueryAsync(dbCmd, token);
@@ -250,14 +251,15 @@ internal static Task<int> DeleteAsync(this IDbCommand dbCmd, Type tableType, str
 
         internal static async Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity, CancellationToken token)
         {
+            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);
+
             var dialectProvider = dbCmd.GetDialectProvider();
 
             dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd,
                 insertFields: dialectProvider.GetNonDefaultValueInsertFields(obj));
 
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
-            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);
             commandFilter?.Invoke(dbCmd);
 
             if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))
@@ -413,6 +415,8 @@ internal static async Task<int> SaveAllAsync<T>(this IDbCommand dbCmd, IEnumerab
                     var id = modelDef.GetPrimaryKey(row);
                     if (id != defaultIdValue && existingRowsMap.ContainsKey(id))
                     {
+                        OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, row);
+
                         await dbCmd.UpdateAsync(row, token, null);
                     }
                     else
@@ -426,6 +430,8 @@ internal static async Task<int> SaveAllAsync<T>(this IDbCommand dbCmd, IEnumerab
                         }
                         else
                         {
+                            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, row);
+
                             await dbCmd.InsertAsync(row, commandFilter:null, selectIdentity:false, token:token);
                         }
 

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -410,14 +410,15 @@ internal static object[] PopulateValues(this IDataReader reader, object[] values
 
         internal static int Update<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter = null)
         {
+            OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);
+
             var dialectProvider = dbCmd.GetDialectProvider();
             var hadRowVersion = dialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);
             if (string.IsNullOrEmpty(dbCmd.CommandText))
                 return 0;
 
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
-            OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);
             commandFilter?.Invoke(dbCmd);
             var rowsUpdated = dbCmd.ExecNonQuery();
 
@@ -674,13 +675,14 @@ internal static int Delete(this IDbCommand dbCmd, Type tableType, string sql, ob
 
         internal static long Insert<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity = false)
         {
+            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);
+
             var dialectProvider = dbCmd.GetDialectProvider();
             dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd, 
                 insertFields: dialectProvider.GetNonDefaultValueInsertFields(obj));
 
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
-            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);
             commandFilter?.Invoke(dbCmd); //dbCmd.OnConflictInsert() needs to be applied before last insert id
 
             if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))
@@ -908,6 +910,7 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                     var id = modelDef.GetPrimaryKey(row);
                     if (id != defaultIdValue && existingRowsMap.ContainsKey(id))
                     {
+                        OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, row);
                         dbCmd.Update(row);
                     }
                     else
@@ -922,6 +925,7 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                         }
                         else
                         {
+                            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, row);
                             dbCmd.Insert(row, commandFilter: null);
                         }