add >> and <<

Author: StpMax

mindsdb_sql_parser/__init__.py

@@ -13,7 +13,8 @@ def __init__(self, lexer, parser):
         self.parser = parser
         self.lexer = lexer
 
-    def process(self, error_info):
+    def process(self) -> str:
+        error_info = self.parser.error_info
         self.tokens = [t for t in error_info['tokens'] if t is not None]
         self.bad_token = error_info['bad_token']
         self.expected_tokens = error_info['expected_tokens']
@@ -175,7 +176,7 @@ def parse_sql(sql, dialect=None):
     if ast is None:
 
         eh = ErrorHandling(lexer, parser)
-        message = eh.process(parser.error_info)
+        message = eh.process()
 
         raise ParsingException(message)
 

mindsdb_sql_parser/lexer.py

@@ -72,7 +72,7 @@ class MindsDBLexer(Lexer):
 
         # Operators
         PLUS, MINUS, MATCH, NOT_MATCH, DIVIDE, MODULO,
-        EQUALS, NEQUALS, GREATER, GEQ, LESS, LEQ,
+        RIGHT_SHIFT, LEFT_SHIFT, EQUALS, NEQUALS, GREATER, GEQ, LESS, LEQ,
         AND, OR, NOT, IS, IS_NOT, TYPECAST,
         IN, NOT_IN, LIKE, NOT_LIKE, CONCAT, BETWEEN, WINDOW, OVER, PARTITION_BY,
         VECT_L2, VECT_L1, VECT_INNER, VECT_COS, VECT_HAMM, VECT_JACC,
@@ -296,6 +296,8 @@ class MindsDBLexer(Lexer):
     NOT_MATCH = r'!~'
     DIVIDE = r'/'
     MODULO = r'%'
+    RIGHT_SHIFT = r'>>'
+    LEFT_SHIFT = r'<<'
     EQUALS = r'='
     NEQUALS = r'(!=|<>)'
     GEQ = r'>='

mindsdb_sql_parser/parser.py

@@ -1633,6 +1633,8 @@ def star(self, p):
        'expr MODULO expr',
        'expr EQUALS expr',
        'expr NEQUALS expr',
+       'expr RIGHT_SHIFT expr',
+       'expr LEFT_SHIFT expr',
        'expr GEQ expr',
        'expr GREATER expr',
        'expr GEQ LAST',

tests/test_base_sql/test_base_lexer.py

@@ -120,6 +120,8 @@ def test_binary_ops(self):
             ('>=', 'GEQ'),
             ('<', 'LESS'),
             ('<=', 'LEQ'),
+            ('>>', 'RIGHT_SHIFT'),
+            ('<<', 'LEFT_SHIFT'),
             ('AND', 'AND'),
             ('OR', 'OR'),
             ('IS', 'IS'),

tests/test_base_sql/test_select_operations.py

@@ -6,7 +6,7 @@
 
 class TestOperations:
     def test_select_binary_operations(self):
-        for op in ['+', '-', '/', '*', '%', '=', '!=', '>', '<', '>=', '<=',
+        for op in ['+', '-', '/', '*', '%', '=', '!=', '>', '<', '>=', '<=', '>>', '<<',
                    'is', 'IS NOT', 'like', 'in', 'and', 'or', '||']:
             sql = f'SELECT column1 {op.upper()} column2 FROM tab'
             ast = parse_sql(sql)