Merge pull request #15 from RohitM-IN/development

Fixed #13 Value Parsing in placeholder for string placeholder type

Author: RohitM-IN

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

src/core/converter.js

@@ -228,7 +228,13 @@ function DevExpressConverter() {
         // Handle object-based values
         if (typeof val === "object") {
             if (val.type === "placeholder") {
-                return resolvePlaceholderFromResultObject(val.value);
+                const placeholderValue = resolvePlaceholderFromResultObject(val.value);
+                
+                if(val?.dataType === "string"){
+                    return placeholderValue?.toString();
+                }
+
+                return placeholderValue;
             }
 
             // Special handling for ISNULL function

src/core/parser.js

@@ -237,7 +237,7 @@ export function parse(input, variables = []) {
 			case "placeholder": {
 				const val = token.value.slice(1, -1);
 				if (!variables.includes(val)) variables.push(val);
-				return { type: "placeholder", value: val };
+				return {  ...token ,type: "placeholder", value: val };
 			}
 
 			case "paren": {

src/core/tokenizer.js

@@ -45,8 +45,17 @@ class Tokenizer {
       if (!type || type === "whitespace") return this.nextToken();
 
       let value = match.groups[type];
+      let dataType = null;
 
       // Remove surrounding single quotes from placeholders
+      if(type === "placeholder"){
+
+        if(value.startsWith("'") && value.endsWith("'")){
+          dataType = "string";
+        }
+
+        value = value.replace(/^[\s'"\(\)]+|[\s'"\(\)]+|[\s]+/g, "");
+      }
       if (type === "placeholder") value = value.replace(/^[\s'"\(\)]+|[\s'"\(\)]+|[\s]+/g, "");
 
       if (type === "operator") {
@@ -68,7 +77,7 @@ class Tokenizer {
       }
 
 
-      return { type, value };
+      return { type, value, ...(dataType !== null && { dataType }) };
     }
 
     // If no valid token is found, throw an error with the remaining input for debugging