Merge pull request #39 from pankaj-bind/issue-fix-parameterized-queries

Added support for Parameterized Queries

Author: ea-rus

mindsdb_sql_parser/ast/insert.py

@@ -97,4 +97,4 @@ def get_string(self, *args, **kwargs):
         else:
             from_select_str = ''
 
-        return f'INSERT INTO {str(self.table)}{columns_str} {values_str}{from_select_str}'
+        return f'INSERT INTO {str(self.table)}{columns_str} {values_str}{from_select_str}'

mindsdb_sql_parser/ast/select/parameter.py

@@ -1,16 +1,20 @@
 from mindsdb_sql_parser.ast.base import ASTNode
+from mindsdb_sql_parser.utils import indent
 
 
 class Parameter(ASTNode):
     def __init__(self, value, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.value = value
 
-    def __repr__(self):
-        return f'Parameter({self.value})'
-
     def to_tree(self, *args, level=0, **kwargs):
-        return '\t' * level + f'Parameter({repr(self.value)})'
+        alias_str = f', alias={self.alias.to_tree()}' if self.alias else ''
+        return indent(level) + f'Parameter(value={repr(self.value)}{alias_str})'
 
     def get_string(self, *args, **kwargs):
+        if self.value == '?':
+            return self.value
         return ':' + str(self.value)
+
+    def __repr__(self):
+        return f'Parameter({repr(self.value)})'

tests/test_base_sql/test_parameters.py

@@ -0,0 +1,28 @@
+from mindsdb_sql_parser import parse_sql
+from mindsdb_sql_parser.ast import *
+
+class TestParameters:
+    def test_select_with_parameter_in_where(self):
+        sql = "SELECT * FROM tbl WHERE col = ?"
+        ast = parse_sql(sql)
+        assert str(ast) == sql
+
+    def test_select_multiple_parameters(self):
+        sql = "SELECT * FROM tbl WHERE col1 > ? AND col2 = ?"
+        ast = parse_sql(sql)
+        assert str(ast) == sql
+
+    def test_insert_with_parameters(self):
+        sql = "INSERT INTO tbl_name(a, c) VALUES (?, ?)"
+        ast = parse_sql(sql)
+        assert str(ast) == sql
+
+    def test_insert_with_multiple_parameter_rows(self):
+        sql = "INSERT INTO tbl_name VALUES (?, ?), (?, ?)"
+        ast = parse_sql(sql)
+        assert str(ast) == sql
+        
+    def test_select_parameter_as_target(self):
+        sql = "SELECT ?"
+        ast = parse_sql(sql)
+        assert str(ast) == sql