From 7745c8cc4f2d692a78d0f2e9b84a6ec30bac0ce4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 6 May 2022 12:06:36 +0800
Subject: [PATCH] cypress: wrap column name by $

---
 scripts/cypress/integration/common/3b_formula_column.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/cypress/integration/common/3b_formula_column.js b/scripts/cypress/integration/common/3b_formula_column.js
index ae7354cdc1..b292fb33c0 100644
--- a/scripts/cypress/integration/common/3b_formula_column.js
+++ b/scripts/cypress/integration/common/3b_formula_column.js
@@ -189,7 +189,7 @@ export const genTest = (apiType, dbType) => {
         it("Formula: ADD, AVG, LEN", () => {
             addFormulaBasedColumn(
                 "NC_MATH_0",
-                "ADD(CityId, CountryId) + AVG(CityId, CountryId) + LEN(City)"
+                "ADD($CityId$, $CountryId$) + AVG($CityId$, $CountryId$) + LEN($City$)"
             );
             rowValidation("NC_MATH_0", RESULT_MATH_0);
         });
@@ -198,7 +198,7 @@ export const genTest = (apiType, dbType) => {
             editColumnByName(
                 "NC_MATH_0",
                 "NC_STR_1",
-                `CONCAT(UPPER(City), LOWER(City), TRIM('    trimmed    '))`
+                `CONCAT(UPPER($City$), LOWER($City$), TRIM('    trimmed    '))`
             );
             rowValidation("NC_STR_1", RESULT_STRING);
         });
@@ -207,7 +207,7 @@ export const genTest = (apiType, dbType) => {
             editColumnByName(
                 "NC_STR_1",
                 "NC_MATH_1",
-                `CEILING(1.4) + FLOOR(1.6) + ROUND(2.5) + MOD(CityId, 3) + MIN(CityId, CountryId) + MAX(CityId, CountryId)`
+                `CEILING(1.4) + FLOOR(1.6) + ROUND(2.5) + MOD($CityId$, 3) + MIN($CityId$, $CountryId$) + MAX($CityId$, $CountryId$)`
             );
             rowValidation("NC_MATH_1", RESULT_MATH_1);
         });
@@ -218,7 +218,7 @@ export const genTest = (apiType, dbType) => {
                 editColumnByName(
                     "NC_MATH_1",
                     "NC_MATH_2",
-                    `LOG(CityId) + EXP(CityId) + POWER(CityId, 3) + SQRT(CountryId)`
+                    `LOG($CityId$) + EXP($CityId$) + POWER($CityId$, 3) + SQRT($CountryId$)`
                 );
                 rowValidation("NC_MATH_2", RESULT_MATH_2);
             }
@@ -237,6 +237,7 @@ export const genTest = (apiType, dbType) => {
  *
  * @author Pranav C Balan <pranavxc@gmail.com>
  * @author Raju Udava <sivadstala@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *