From 24800bb1f138302a2176de8c8fcf35ae03e3cc1c Mon Sep 17 00:00:00 2001 From: David Nascimento Date: Fri, 24 Jan 2020 12:05:15 +0100 Subject: [PATCH 1/2] fix: add support for queries with Take() in BatchUpdate (EFCore) --- src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs index dbb17d25..25a89ee5 100644 --- a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs +++ b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs @@ -1455,6 +1455,10 @@ public List> GetInnerValues(IQueryable query, Expres var valueSql = commandText.Substring(6, pos); #endif + if (valueSql.Trim().StartsWith("TOP") && valueSql.IndexOf(")") != -1) + { + valueSql = valueSql.Substring(valueSql.IndexOf(")") + 1); + } valueSql = valueSql.Trim(); From 1d9e7c430066370140744f18b8522c544b2ef85b Mon Sep 17 00:00:00 2001 From: David Nascimento Date: Fri, 24 Jan 2020 12:11:24 +0100 Subject: [PATCH 2/2] fix: fixed indentation --- src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs index 25a89ee5..6670b691 100644 --- a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs +++ b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs @@ -1455,10 +1455,10 @@ public List> GetInnerValues(IQueryable query, Expres var valueSql = commandText.Substring(6, pos); #endif - if (valueSql.Trim().StartsWith("TOP") && valueSql.IndexOf(")") != -1) - { - valueSql = valueSql.Substring(valueSql.IndexOf(")") + 1); - } + if (valueSql.Trim().StartsWith("TOP") && valueSql.IndexOf(")") != -1) + { + valueSql = valueSql.Substring(valueSql.IndexOf(")") + 1); + } valueSql = valueSql.Trim();