feat: Add support for parameterized queries with '?'

Author: pankaj-bind

mindsdb_sql_parser/ast/insert.py

@@ -79,7 +79,7 @@ def to_tree(self, *args, level=0, **kwargs):
     def get_string(self, *args, **kwargs):
         if self.columns is not None:
             cols = ', '.join([i.name for i in self.columns])
-            columns_str = f'({cols})'
+            columns_str = f' ({cols})'
         else:
             columns_str = ''
 
@@ -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

@@ -12,7 +12,9 @@ def to_tree(self, *args, level=0, **kwargs):
         return indent(level) + f'Parameter(value={repr(self.value)}{alias_str})'
 
     def get_string(self, *args, **kwargs):
-        return str(self.value)
+        if self.value == '?':
+            return self.value
+        return ':' + str(self.value)
 
     def __repr__(self):
         return f'Parameter({repr(self.value)})'

tests/test_base_sql/test_insert.py

@@ -7,7 +7,7 @@
 class TestInsert:
 
     def test_insert(self):
-        sql = "INSERT INTO tbl_name(a, c) VALUES (1, 3), (4, 5)"
+        sql = "INSERT INTO tbl_name (a, c) VALUES (1, 3), (4, 5)"
 
         ast = parse_sql(sql)
         expected_ast = Insert(
@@ -37,7 +37,7 @@ def test_insert_no_columns(self):
         assert ast.to_tree() == expected_ast.to_tree()
 
     def test_insert_from_select(self):
-        sql = "INSERT INTO tbl_name(a, c) SELECT b, d from table2"
+        sql = "INSERT INTO tbl_name (a, c) SELECT b, d from table2"
 
         ast = parse_sql(sql)
         expected_ast = Insert(
@@ -78,7 +78,7 @@ class TestInsertMDB:
     def test_insert_from_union(self):
         from textwrap import dedent
         sql = dedent("""
-           INSERT INTO tbl_name(a, c) SELECT * from table1
+           INSERT INTO tbl_name (a, c) SELECT * from table1
            UNION
            SELECT * from table2""")[1:]
 

tests/test_base_sql/test_parameters.py

@@ -14,7 +14,7 @@ def test_select_with_parameter_in_where(self):
             ])
         )
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
+        assert str(ast) == sql
 
     def test_select_multiple_parameters(self):
         sql = "SELECT * FROM tbl WHERE col1 > ? AND col2 = ?"
@@ -34,10 +34,10 @@ def test_select_multiple_parameters(self):
             ])
         )
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
+        assert str(ast) == sql
 
     def test_insert_with_parameters(self):
-        sql = "INSERT INTO tbl_name(a, c) VALUES (?, ?)"
+        sql = "INSERT INTO tbl_name (a, c) VALUES (?, ?)"
         ast = parse_sql(sql)
         expected_ast = Insert(
             table=Identifier('tbl_name'),
@@ -47,7 +47,7 @@ def test_insert_with_parameters(self):
             ]
         )
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
+        assert str(ast) == sql
 
     def test_insert_with_multiple_parameter_rows(self):
         sql = "INSERT INTO tbl_name VALUES (?, ?), (?, ?)"
@@ -60,7 +60,7 @@ def test_insert_with_multiple_parameter_rows(self):
             ]
         )
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
+        assert str(ast) == sql
 
     def test_select_parameter_as_target(self):
         sql = "SELECT ?"
@@ -69,4 +69,4 @@ def test_select_parameter_as_target(self):
             targets=[Parameter('?')]
         )
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
+        assert str(ast) == sql