MySQLConnector.js,SnowflakeConnector.js,JSONConnector.js,InfluxConnector.js,BigQueryConnector.js,ClickhouseConnector.js - Updated Filter condition to use '=' instead of IN for single value

niravthakkar · niravthakkar · commit d7df025011c4 · 2022-01-11T19:40:19.000+05:30
RedShiftConnector.js,CassandraConnector.js - Updated Filter condition to use '=' instead of IN for single value &amp; Escape single quote in Data
MSSQLConnector.js - Escape single Quote in Data
diff --git a/BigQueryConnector.js b/BigQueryConnector.js
@@ -796,6 +796,11 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf("IN") > -1) {
       //IN condition has different format
diff --git a/CassandraConnector.js b/CassandraConnector.js
@@ -580,10 +580,15 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
       if (typeof value[0] == 'string') {
-        conditiontext += ' ' + sign + ' (\'' + value.join('\',\'') + '\')';
+        conditiontext += ' ' + sign + ' (\'' + value.map((e) => e.replace(/'/g, "''")).join("','") + '\')';
       } else {
         conditiontext += ' ' + sign + ' (' + value.join(',') + ')';
       }
@@ -598,7 +603,7 @@ function createSingleCondition(obj) {
         }
       } else {
         if (typeof value == 'string') {
-          tempValue = '\'' + value + '\'';
+          tempValue = '\'' +  value.replace(/'/g, "''") + '\'';
         } else {
           tempValue = value;
         }
diff --git a/ClickhouseConnector.js b/ClickhouseConnector.js
@@ -526,10 +526,15 @@ function createSingleCondition(obj) {
     }
 
     if (operator != undefined) {
+        if(Array.isArray(value) && value.length ==1)
+        {
+        const updatedValue = value[0];
+        value = updatedValue;
+        }
         var sign = operatorSign(operator, value);
         if (sign.indexOf('IN') > -1) { //IN condition has different format
             if (typeof value[0] == 'string') {
-                conditiontext += ' ' + sign + " ('" + value.join("','") + "')";
+                conditiontext += ' ' + sign + " ('" + value.map((d) => (d != null ? d.toString().replace(/\'/gi, "\\'") : d)).join("','") + "')";
             } else {
                 conditiontext += ' ' + sign + ' (' + value.join(',') + ')';
             }
@@ -544,7 +549,7 @@ function createSingleCondition(obj) {
                 }
             } else {
                 if (typeof value == 'string') {
-                    tempValue = '\'' + value + '\'';
+                    tempValue = '\'' + replaceSingleQuote(value) + '\'';
                 } else {
                     tempValue = value;
                 }
diff --git a/InfluxConnector.js b/InfluxConnector.js
@@ -365,6 +365,11 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) {
       //IN condition has different format for Influx
diff --git a/JSONConnector.js b/JSONConnector.js
@@ -256,6 +256,11 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
       var tempValue = value.map(d => d != null ? d.toString().replace(/\'/ig, "\\\'") : d).join("','");
diff --git a/MSSQLConnector.js b/MSSQLConnector.js
@@ -635,7 +635,7 @@ function createSingleCondition(obj) {
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
       if (typeof value[0] == 'string') {
-        conditiontext += " " + sign + " ('" + value.join("','") + "')";
+        conditiontext += " " + sign + " ('" + value.map((e) => e.replace(/'/g, "''")).join("','") + "')";        
       } else {
         conditiontext += " " + sign + " ('" + value.join(",") + ")";
       }
diff --git a/MySQLConnector.js b/MySQLConnector.js
@@ -634,6 +634,11 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
       var tempValue = value.map(d => d != null ? d.toString().replace(/\'/ig, "\\\'") : d).join("','");
diff --git a/RedShiftConnector.js b/RedShiftConnector.js
@@ -654,9 +654,14 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
-      conditiontext += ' ' + sign + ' (\'' + value.join("','") + '\')';
+      conditiontext += ' ' + sign + ' (\'' + value.map((e) => e.replace(/'/g, "''")).join("','") + '\')';
     } else {
       var tempValue = '';
       if (typeof value === 'undefined' || value == null) {
@@ -668,7 +673,7 @@ function createSingleCondition(obj) {
           tempValue = encloseField(rTable) + '.' + encloseField(value.field);
         }
       } else {
-        tempValue = '\'' + value + '\'';
+        tempValue = '\'' + value.replace(/'/g, "''") + '\'';
       }
       conditiontext += ' ' + sign + ' ' + tempValue;
     }
diff --git a/SnowflakeConnector.js b/SnowflakeConnector.js
@@ -635,6 +635,11 @@ function createSingleCondition(obj) {
   }
 
   if (operator != undefined) {
+    if(Array.isArray(value) && value.length ==1)
+     {
+       const updatedValue = value[0];
+       value = updatedValue;
+     }
     var sign = operatorSign(operator, value);
     if (sign.indexOf('IN') > -1) { //IN condition has different format
       if (typeof value[0] == 'string') {

Original file line number	Diff line number	Diff line change
`@@ -580,10 +580,15 @@ function createSingleCondition(obj) {`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`if (operator != undefined) {`
	`583`	`+ if(Array.isArray(value) && value.length ==1)`
	`584`	`+ {`
	`585`	`+ const updatedValue = value[0];`
	`586`	`+ value = updatedValue;`
	`587`	`+ }`
`583`	`588`	`var sign = operatorSign(operator, value);`
`584`	`589`	`if (sign.indexOf('IN') > -1) { //IN condition has different format`
`585`	`590`	`if (typeof value[0] == 'string') {`
`586`		`- conditiontext += ' ' + sign + ' (\'' + value.join('\',\'') + '\')';`
	`591`	`+ conditiontext += ' ' + sign + ' (\'' + value.map((e) => e.replace(/'/g, "''")).join("','") + '\')';`
`587`	`592`	`} else {`
`588`	`593`	`conditiontext += ' ' + sign + ' (' + value.join(',') + ')';`
`589`	`594`	`}`
`@@ -598,7 +603,7 @@ function createSingleCondition(obj) {`
`598`	`603`	`}`
`599`	`604`	`} else {`
`600`	`605`	`if (typeof value == 'string') {`
`601`		`- tempValue = '\'' + value + '\'';`
	`606`	`+ tempValue = '\'' + value.replace(/'/g, "''") + '\'';`
`602`	`607`	`} else {`
`603`	`608`	`tempValue = value;`
`604`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,10 +526,15 @@ function createSingleCondition(obj) {`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`if (operator != undefined) {`
	`529`	`+ if(Array.isArray(value) && value.length ==1)`
	`530`	`+ {`
	`531`	`+ const updatedValue = value[0];`
	`532`	`+ value = updatedValue;`
	`533`	`+ }`
`529`	`534`	`var sign = operatorSign(operator, value);`
`530`	`535`	`if (sign.indexOf('IN') > -1) { //IN condition has different format`
`531`	`536`	`if (typeof value[0] == 'string') {`
`532`		`- conditiontext += ' ' + sign + " ('" + value.join("','") + "')";`
	`537`	`+ conditiontext += ' ' + sign + " ('" + value.map((d) => (d != null ? d.toString().replace(/\'/gi, "\\'") : d)).join("','") + "')";`
`533`	`538`	`} else {`
`534`	`539`	`conditiontext += ' ' + sign + ' (' + value.join(',') + ')';`
`535`	`540`	`}`
`@@ -544,7 +549,7 @@ function createSingleCondition(obj) {`
`544`	`549`	`}`
`545`	`550`	`} else {`
`546`	`551`	`if (typeof value == 'string') {`
`547`		`- tempValue = '\'' + value + '\'';`
	`552`	`+ tempValue = '\'' + replaceSingleQuote(value) + '\'';`
`548`	`553`	`} else {`
`549`	`554`	`tempValue = value;`
`550`	`555`	`}`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ function createSingleCondition(obj) {`
`635`	`635`	`var sign = operatorSign(operator, value);`
`636`	`636`	`if (sign.indexOf('IN') > -1) { //IN condition has different format`
`637`	`637`	`if (typeof value[0] == 'string') {`
`638`		`- conditiontext += " " + sign + " ('" + value.join("','") + "')";`
	`638`	`+ conditiontext += " " + sign + " ('" + value.map((e) => e.replace(/'/g, "''")).join("','") + "')";`
`639`	`639`	`} else {`
`640`	`640`	`conditiontext += " " + sign + " ('" + value.join(",") + ")";`
`641`	`641`	`}`
Original file line number	Diff line number	Diff line change
`@@ -654,9 +654,14 @@ function createSingleCondition(obj) {`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`if (operator != undefined) {`
	`657`	`+ if(Array.isArray(value) && value.length ==1)`
	`658`	`+ {`
	`659`	`+ const updatedValue = value[0];`
	`660`	`+ value = updatedValue;`
	`661`	`+ }`
`657`	`662`	`var sign = operatorSign(operator, value);`
`658`	`663`	`if (sign.indexOf('IN') > -1) { //IN condition has different format`
`659`		`- conditiontext += ' ' + sign + ' (\'' + value.join("','") + '\')';`
	`664`	`+ conditiontext += ' ' + sign + ' (\'' + value.map((e) => e.replace(/'/g, "''")).join("','") + '\')';`
`660`	`665`	`} else {`
`661`	`666`	`var tempValue = '';`
`662`	`667`	`if (typeof value === 'undefined' \|\| value == null) {`
`@@ -668,7 +673,7 @@ function createSingleCondition(obj) {`
`668`	`673`	`tempValue = encloseField(rTable) + '.' + encloseField(value.field);`
`669`	`674`	`}`
`670`	`675`	`} else {`
`671`		`- tempValue = '\'' + value + '\'';`
	`676`	`+ tempValue = '\'' + value.replace(/'/g, "''") + '\'';`
`672`	`677`	`}`
`673`	`678`	`conditiontext += ' ' + sign + ' ' + tempValue;`
`674`	`679`	`}`