Fix BatchUpdate

zzzprojects · zzzprojects · commit 4f6c8c1d199c · 2017-10-16T10:30:40.000-04:00
Fix BatchUpdate
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
@@ -1005,12 +1005,12 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
                     }
 
                     // CHECK if valueSql end with ' AS [XYZ]'
-                    if (valueSql.LastIndexOf('[') != -1 && valueSql.Substring(0, valueSql.LastIndexOf('[')).EndsWith(" AS ", StringComparison.InvariantCulture))
+                    if (valueSql.LastIndexOf('[') != -1 && !valueSql.Trim().EndsWith(")", StringComparison.InvariantCulture) && valueSql.Substring(0, valueSql.LastIndexOf('[')).EndsWith(" AS ", StringComparison.InvariantCulture))
                     {
                         valueSql = valueSql.Substring(0, valueSql.LastIndexOf('[') - 4);
                     }
 
-                    if (valueSql.LastIndexOf('`') != -1 && valueSql.Substring(0, valueSql.LastIndexOf('`')).EndsWith(" AS ", StringComparison.InvariantCulture))
+                    if (valueSql.LastIndexOf('`') != -1 && !valueSql.Trim().EndsWith(")", StringComparison.InvariantCulture) &&  valueSql.Substring(0, valueSql.LastIndexOf('`')).EndsWith(" AS ", StringComparison.InvariantCulture))
                     {
                         valueSql = valueSql.Substring(0, valueSql.LastIndexOf('`') - 4);
                     }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.7.3
+v1.7.4

Original file line number	Diff line number	Diff line change
`@@ -1005,12 +1005,12 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`	`1007`	`// CHECK if valueSql end with ' AS [XYZ]'`
`1008`		`- if (valueSql.LastIndexOf('[') != -1 && valueSql.Substring(0, valueSql.LastIndexOf('[')).EndsWith(" AS ", StringComparison.InvariantCulture))`
	`1008`	`+ if (valueSql.LastIndexOf('[') != -1 && !valueSql.Trim().EndsWith(")", StringComparison.InvariantCulture) && valueSql.Substring(0, valueSql.LastIndexOf('[')).EndsWith(" AS ", StringComparison.InvariantCulture))`
`1009`	`1009`	`{`
`1010`	`1010`	`valueSql = valueSql.Substring(0, valueSql.LastIndexOf('[') - 4);`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`		- if (valueSql.LastIndexOf('`') != -1 && valueSql.Substring(0, valueSql.LastIndexOf('`')).EndsWith(" AS ", StringComparison.InvariantCulture))
	`1013`	+ if (valueSql.LastIndexOf('`') != -1 && !valueSql.Trim().EndsWith(")", StringComparison.InvariantCulture) && valueSql.Substring(0, valueSql.LastIndexOf('`')).EndsWith(" AS ", StringComparison.InvariantCulture))
`1014`	`1014`	`{`
`1015`	`1015`	valueSql = valueSql.Substring(0, valueSql.LastIndexOf('`') - 4);
`1016`	`1016`	`}`