Merge pull request #74 from mindsdb/named-parameters

Named parameters support

Author: ea-rus

mindsdb_sql_parser/__about__.py

@@ -1,6 +1,6 @@
 __title__ = 'mindsdb_sql_parser'
 __package_name__ = 'mindsdb_sql_parser'
-__version__ = '0.13.1'
+__version__ = '0.13.2'
 __description__ = "Mindsdb SQL parser"
 __email__ = "[email protected]"
 __author__ = 'MindsDB Inc'

mindsdb_sql_parser/lexer.py

@@ -272,7 +272,6 @@ class MindsDBLexer(Lexer):
     COMMA = r','
     LPAREN = r'\('
     RPAREN = r'\)'
-    PARAMETER = r'\?'
 
     ASSIGN_COLON = r':='
 
@@ -281,7 +280,6 @@ class MindsDBLexer(Lexer):
     RBRACE = r'\}'
     LBRACKET = r'\['
     RBRACKET = r'\]'
-    COLON = r'\:'
     SEMICOLON = r'\;'
 
     # Operators
@@ -337,6 +335,13 @@ class MindsDBLexer(Lexer):
     TRUE = r'\bTRUE\b'
     FALSE = r'\bFALSE\b'
 
+    @_(r':[a-zA-Z]{1}[a-zA-Z_\d]*', r'\?')
+    def PARAMETER(self, t):
+        t.value = t.value.lstrip(':')
+        return t
+
+    COLON = r'\:'
+
     @_(r'(?:([a-zA-Z_$0-9]*[a-zA-Z_$]+[a-zA-Z_$0-9]*)|(?:`([^`]+)`))')
     def ID(self, t):
         return t

tests/test_base_sql/test_parameters.py

@@ -1,6 +1,7 @@
 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 = ?"
@@ -25,4 +26,28 @@ def test_insert_with_multiple_parameter_rows(self):
     def test_select_parameter_as_target(self):
         sql = "SELECT ?"
         ast = parse_sql(sql)
-        assert str(ast) == sql
+        assert str(ast) == sql
+
+    def test_named_parameters(self):
+        sql = "SELECT :a, max(1-:second_param), ? from t where x=:col_1"
+        ast = parse_sql(sql)
+
+        expected = Select(
+            targets=[
+                Parameter("a"),
+                Function("max", args=[
+                    BinaryOperation(op="-", args=[
+                        Constant(1),
+                        Parameter("second_param")
+                    ])
+                ]),
+                Parameter("?")
+            ],
+            from_table=Identifier("t"),
+            where=BinaryOperation(op="=", args=[
+                Identifier("x"),
+                Parameter("col_1")
+            ])
+        )
+
+        assert str(ast) == str(expected)