Update regex to only match whole select attributes and skip CAST subexpressions

gusbro · gusbro · commit 0d1dcf67e631 · 2023-06-23T10:31:46.000-03:00
diff --git a/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs b/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
@@ -5470,7 +5470,7 @@ public static string PagingSelect(string select)
 			try
 			{
 				IDictionary<string, string> maps = new Dictionary<string, string>();
-				foreach (Match match in Regex.Matches(pagingSelect, @"GX_ICTE\.(\[\w+\]) AS \b(\w+)\b", RegexOptions.Compiled | RegexOptions.CultureInvariant))
+				foreach (Match match in Regex.Matches(pagingSelect, @"GX_ICTE\.(\[\w+]) AS \b(\w+)\b(?=,|$)", RegexOptions.Compiled | RegexOptions.CultureInvariant))
 				{
 					if (match.Groups.Count == 3)
 					{

Original file line number	Diff line number	Diff line change
`@@ -5470,7 +5470,7 @@ public static string PagingSelect(string select)`
`5470`	`5470`	`try`
`5471`	`5471`	`{`
`5472`	`5472`	`IDictionary<string, string> maps = new Dictionary<string, string>();`
`5473`		`- foreach (Match match in Regex.Matches(pagingSelect, @"GX_ICTE\.(\[\w+\]) AS \b(\w+)\b", RegexOptions.Compiled \| RegexOptions.CultureInvariant))`
	`5473`	`+ foreach (Match match in Regex.Matches(pagingSelect, @"GX_ICTE\.(\[\w+]) AS \b(\w+)\b(?=,\|$)", RegexOptions.Compiled \| RegexOptions.CultureInvariant))`
`5474`	`5474`	`{`
`5475`	`5475`	`if (match.Groups.Count == 3)`
`5476`	`5476`	`{`