Merge pull request #3538 from Ginger-Automation/BugFix/D37328_DataSou…

…rceFix D37328_Data source where clause Fix, When In where clause any variabl…
Ginger-Automation · Mar 4, 2024 · 6aa0920 · 6aa0920
2 parents 7a5a979 + d9cda85
commit 6aa0920
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs
@@ -375,6 +375,10 @@ public void SetDataSourceVEParams(string p)
                                             if (arrORCond[iOrCount].IndexOf("'") != -1)
                                             {
                                                 wColVal = arrORCond[iOrCount].Substring(arrORCond[iOrCount].IndexOf("'") + 1, arrORCond[iOrCount].LastIndexOf("'") - arrORCond[iOrCount].IndexOf("'") - 1);
+                                                if (wColVal.Contains("$$$"))
+                                                {
+                                                    wColVal = wColVal.Replace("$$$", " ");
+                                                }
                                             }
                                             else if (condVal.Length > 1)
                                             {
@@ -387,6 +391,10 @@ public void SetDataSourceVEParams(string p)
                                             if (arrORCond[iOrCount].IndexOf("'") != -1)
                                             {
                                                 wColVal = arrORCond[iOrCount].Substring(arrORCond[iOrCount].IndexOf("'") + 1, arrORCond[iOrCount].LastIndexOf("'") - arrORCond[iOrCount].IndexOf("'") - 1);
+                                                if (wColVal.Contains("$$$"))
+                                                {
+                                                    wColVal = wColVal.Replace("$$$", " ");
+                                                }
                                             }
                                             else if (condVal.Length > 1)
                                             {