Execute filters after initializing CommandText

mythz · mythz · commit d819d06a3630 · 2019-12-25T17:33:42.000-05:00
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs
@@ -58,14 +58,13 @@ 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);
@@ -251,15 +250,14 @@ 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))
@@ -415,8 +413,6 @@ 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
@@ -430,8 +426,6 @@ 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);
                         }
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs
@@ -410,15 +410,14 @@ 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();
 
@@ -675,14 +674,13 @@ 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))
@@ -910,7 +908,6 @@ 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
@@ -925,7 +922,6 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                         }
                         else
                         {
-                            OrmLiteConfig.InsertFilter?.Invoke(dbCmd, row);
                             dbCmd.Insert(row, commandFilter: null);
                         }
 
diff --git a/tests/ServiceStack.OrmLite.Tests/FilterTests.cs b/tests/ServiceStack.OrmLite.Tests/FilterTests.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using ServiceStack.Common.Tests.Models;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests
+{
+    public class FilterTests : OrmLiteTestBase
+    {
+        [Test]
+        public async Task Does_fire_correct_filters()
+        {
+            var sbInsert = new List<string>(); 
+            var sbUpdate = new List<string>();
+            OrmLiteConfig.InsertFilter = (cmd, o) => sbInsert.Add(cmd.CommandText);
+            OrmLiteConfig.UpdateFilter = (cmd, o) => sbUpdate.Add(cmd.CommandText);
+
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<Poco>();
+                await db.SaveAllAsync(new[] {
+                    new Poco {Id = 1, Name = "A1"},
+                    new Poco {Id = 2, Name = "B1"},
+                });
+                
+                Assert.That(sbInsert[0], Does.StartWith("INSERT"));
+                Assert.That(sbInsert[1], Does.StartWith("INSERT"));
+
+                await db.SaveAllAsync(new[] {
+                    new Poco {Id = 1, Name = "A2"},
+                    new Poco {Id = 2, Name = "B2"},
+                });
+                
+                Assert.That(sbUpdate[0], Does.StartWith("UPDATE"));
+                Assert.That(sbUpdate[1], Does.StartWith("UPDATE"));
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,13 @@ internal static Task<int> ExecuteSqlAsync(this IDbCommand dbCmd, string sql, obj`
`58`	`58`
`59`	`59`	`internal static async Task<int> UpdateAsync<T>(this IDbCommand dbCmd, T obj, CancellationToken token, Action<IDbCommand> commandFilter)`
`60`	`60`	`{`
`61`		`- OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);`
`62`		`-`
`63`	`61`	`var dialectProvider = dbCmd.GetDialectProvider();`
`64`	`62`	`var hadRowVersion = dialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);`
`65`	`63`	`if (string.IsNullOrEmpty(dbCmd.CommandText))`
`66`	`64`	`return 0;`
`67`	`65`
`68`	`66`	`dialectProvider.SetParameterValues<T>(dbCmd, obj);`
	`67`	`+ OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);`
`69`	`68`	`commandFilter?.Invoke(dbCmd);`
`70`	`69`
`71`	`70`	`var rowsUpdated = await dialectProvider.ExecuteNonQueryAsync(dbCmd, token);`
`@@ -251,15 +250,14 @@ internal static Task<int> DeleteAsync(this IDbCommand dbCmd, Type tableType, str`
`251`	`250`
`252`	`251`	`internal static async Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity, CancellationToken token)`
`253`	`252`	`{`
`254`		`- OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);`
`255`		`-`
`256`	`253`	`var dialectProvider = dbCmd.GetDialectProvider();`
`257`	`254`
`258`	`255`	`dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd,`
`259`	`256`	`insertFields: dialectProvider.GetNonDefaultValueInsertFields(obj));`
`260`	`257`
`261`	`258`	`dialectProvider.SetParameterValues<T>(dbCmd, obj);`
`262`	`259`
	`260`	`+ OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);`
`263`	`261`	`commandFilter?.Invoke(dbCmd);`
`264`	`262`
`265`	`263`	`if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))`
`@@ -415,8 +413,6 @@ internal static async Task<int> SaveAllAsync<T>(this IDbCommand dbCmd, IEnumerab`
`415`	`413`	`var id = modelDef.GetPrimaryKey(row);`
`416`	`414`	`if (id != defaultIdValue && existingRowsMap.ContainsKey(id))`
`417`	`415`	`{`
`418`		`- OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, row);`
`419`		`-`
`420`	`416`	`await dbCmd.UpdateAsync(row, token, null);`
`421`	`417`	`}`
`422`	`418`	`else`
`@@ -430,8 +426,6 @@ internal static async Task<int> SaveAllAsync<T>(this IDbCommand dbCmd, IEnumerab`
`430`	`426`	`}`
`431`	`427`	`else`
`432`	`428`	`{`
`433`		`- OrmLiteConfig.InsertFilter?.Invoke(dbCmd, row);`
`434`		`-`
`435`	`429`	`await dbCmd.InsertAsync(row, commandFilter:null, selectIdentity:false, token:token);`
`436`	`430`	`}`
`437`	`431`
Original file line number	Diff line number	Diff line change
`@@ -410,15 +410,14 @@ internal static object[] PopulateValues(this IDataReader reader, object[] values`
`410`	`410`
`411`	`411`	`internal static int Update<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter = null)`
`412`	`412`	`{`
`413`		`- OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);`
`414`		`-`
`415`	`413`	`var dialectProvider = dbCmd.GetDialectProvider();`
`416`	`414`	`var hadRowVersion = dialectProvider.PrepareParameterizedUpdateStatement<T>(dbCmd);`
`417`	`415`	`if (string.IsNullOrEmpty(dbCmd.CommandText))`
`418`	`416`	`return 0;`
`419`	`417`
`420`	`418`	`dialectProvider.SetParameterValues<T>(dbCmd, obj);`
`421`	`419`
	`420`	`+ OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, obj);`
`422`	`421`	`commandFilter?.Invoke(dbCmd);`
`423`	`422`	`var rowsUpdated = dbCmd.ExecNonQuery();`
`424`	`423`
`@@ -675,14 +674,13 @@ internal static int Delete(this IDbCommand dbCmd, Type tableType, string sql, ob`
`675`	`674`
`676`	`675`	`internal static long Insert<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity = false)`
`677`	`676`	`{`
`678`		`- OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);`
`679`		`-`
`680`	`677`	`var dialectProvider = dbCmd.GetDialectProvider();`
`681`	`678`	`dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd,`
`682`	`679`	`insertFields: dialectProvider.GetNonDefaultValueInsertFields(obj));`
`683`	`680`
`684`	`681`	`dialectProvider.SetParameterValues<T>(dbCmd, obj);`
`685`	`682`
	`683`	`+ OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);`
`686`	`684`	`commandFilter?.Invoke(dbCmd); //dbCmd.OnConflictInsert() needs to be applied before last insert id`
`687`	`685`
`688`	`686`	`if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))`
`@@ -910,7 +908,6 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)`
`910`	`908`	`var id = modelDef.GetPrimaryKey(row);`
`911`	`909`	`if (id != defaultIdValue && existingRowsMap.ContainsKey(id))`
`912`	`910`	`{`
`913`		`- OrmLiteConfig.UpdateFilter?.Invoke(dbCmd, row);`
`914`	`911`	`dbCmd.Update(row);`
`915`	`912`	`}`
`916`	`913`	`else`
`@@ -925,7 +922,6 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)`
`925`	`922`	`}`
`926`	`923`	`else`
`927`	`924`	`{`
`928`		`- OrmLiteConfig.InsertFilter?.Invoke(dbCmd, row);`
`929`	`925`	`dbCmd.Insert(row, commandFilter: null);`
`930`	`926`	`}`
`931`	`927`