Fix hardcoding issue

zzzprojects · zzzprojects · commit 4842bdfff631 · 2016-09-03T15:30:10.000-04:00
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/BatchDelete/BatchDelete.cs b/src/Z.EntityFramework.Plus.EF5.NET40/BatchDelete/BatchDelete.cs
@@ -11,6 +11,7 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 #if EF5
@@ -133,7 +134,9 @@ public BatchDelete()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/BatchUpdate/BatchUpdate.cs b/src/Z.EntityFramework.Plus.EF5.NET40/BatchUpdate/BatchUpdate.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-
+using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
@@ -127,7 +127,9 @@ public BatchUpdate()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.3.11")]
-[assembly: AssemblyFileVersion("1.3.11")]
+[assembly: AssemblyVersion("1.3.12")]
+[assembly: AssemblyFileVersion("1.3.12")]
diff --git a/src/Z.EntityFramework.Plus.EF5/BatchDelete/BatchDelete.cs b/src/Z.EntityFramework.Plus.EF5/BatchDelete/BatchDelete.cs
@@ -11,6 +11,7 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 #if EF5
@@ -133,7 +134,9 @@ public BatchDelete()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF5/BatchUpdate/BatchUpdate.cs b/src/Z.EntityFramework.Plus.EF5/BatchUpdate/BatchUpdate.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-
+using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
@@ -127,7 +127,9 @@ public BatchUpdate()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
-[assembly: AssemblyVersion("1.3.11")]
-[assembly: AssemblyFileVersion("1.3.11")]
+[assembly: AssemblyVersion("1.3.12")]
+[assembly: AssemblyFileVersion("1.3.12")]
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/BatchDelete/BatchDelete.cs b/src/Z.EntityFramework.Plus.EF6.NET40/BatchDelete/BatchDelete.cs
@@ -11,6 +11,7 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 #if EF5
@@ -133,7 +134,9 @@ public BatchDelete()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/BatchUpdate/BatchUpdate.cs b/src/Z.EntityFramework.Plus.EF6.NET40/BatchUpdate/BatchUpdate.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-
+using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
@@ -127,7 +127,9 @@ public BatchUpdate()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.3.11")]
-[assembly: AssemblyFileVersion("1.3.11")]
+[assembly: AssemblyVersion("1.3.12")]
+[assembly: AssemblyFileVersion("1.3.12")]
diff --git a/src/Z.EntityFramework.Plus.EF6/BatchDelete/BatchDelete.cs b/src/Z.EntityFramework.Plus.EF6/BatchDelete/BatchDelete.cs
@@ -11,6 +11,7 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 #if EF5
@@ -133,7 +134,9 @@ public BatchDelete()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate.cs b/src/Z.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-
+using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
@@ -127,7 +127,9 @@ public BatchUpdate()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.3.11")]
-[assembly: AssemblyFileVersion("1.3.11")]
+[assembly: AssemblyVersion("1.3.12")]
+[assembly: AssemblyFileVersion("1.3.12")]
diff --git a/src/Z.EntityFramework.Plus.EFCore/BatchDelete/BatchDelete.cs b/src/Z.EntityFramework.Plus.EFCore/BatchDelete/BatchDelete.cs
@@ -11,6 +11,7 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 #if EF5
@@ -133,7 +134,9 @@ public BatchDelete()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EFCore/BatchUpdate/BatchUpdate.cs b/src/Z.EntityFramework.Plus.EFCore/BatchUpdate/BatchUpdate.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-
+using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
@@ -127,7 +127,9 @@ public BatchUpdate()
         /// <returns>The number of rows affected.</returns>
         public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class
         {
-            if (query.Expression.ToString().Contains(".Where(x => False)"))
+            string expression = query.Expression.ToString();
+
+            if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))
             {
                 return 0;
             }
diff --git a/src/Z.EntityFramework.Plus.EFCore/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EFCore/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("c41195f5-937e-4f2b-9f36-20650a804caa")]
-[assembly: AssemblyVersion("1.3.11")]
-[assembly: AssemblyFileVersion("1.3.11")]
+[assembly: AssemblyVersion("1.3.12")]
+[assembly: AssemblyFileVersion("1.3.12")]
diff --git a/src/Z.EntityFramework.Plus.EFCore/project.json b/src/Z.EntityFramework.Plus.EFCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "EF Bulk Operations & Utilities | Bulk Insert, Update, Delete, Merge from database.",
   "authors": [ "ZZZ Projects Inc." ],
   "packOptions": {
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.3.11
+v1.3.12

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using System.Data.Common;`
`12`	`12`	`using System.IO;`
`13`	`13`	`using System.Linq;`
	`14`	`+using System.Text.RegularExpressions;`
`14`	`15`	`using System.Threading;`
`15`	`16`
`16`	`17`	`#if EF5`
`@@ -133,7 +134,9 @@ public BatchDelete()`
`133`	`134`	`/// <returns>The number of rows affected.</returns>`
`134`	`135`	`public int Execute<T>(IQueryable<T> query) where T : class`
`135`	`136`	`{`
`136`		`- if (query.Expression.ToString().Contains(".Where(x => False)"))`
	`137`	`+ string expression = query.Expression.ToString();`
	`138`	`+`
	`139`	`+ if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))`
`137`	`140`	`{`
`138`	`141`	`return 0;`
`139`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using System.Data.Common;`
`12`	`12`	`using System.Linq;`
`13`	`13`	`using System.Linq.Expressions;`
`14`		`-`
	`14`	`+using System.Text.RegularExpressions;`
`15`	`15`	`#if EF5`
`16`	`16`	`using System.Data.Objects;`
`17`	`17`	`using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;`
`@@ -127,7 +127,9 @@ public BatchUpdate()`
`127`	`127`	`/// <returns>The number of rows affected.</returns>`
`128`	`128`	`public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory) where T : class`
`129`	`129`	`{`
`130`		`- if (query.Expression.ToString().Contains(".Where(x => False)"))`
	`130`	`+ string expression = query.Expression.ToString();`
	`131`	`+`
	`132`	`+ if (Regex.IsMatch(expression, @"\.Where\(\w+ => False\)"))`
`131`	`133`	`{`
`132`	`134`	`return 0;`
`133`	`135`	`}`