add operations: & | ^

Author: StpMax

mindsdb_sql_parser/lexer.py

@@ -71,7 +71,7 @@ class MindsDBLexer(Lexer):
         LBRACE, RBRACE, LBRACKET, RBRACKET, COLON, SEMICOLON,
 
         # Operators
-        PLUS, MINUS, MATCH, NOT_MATCH, DIVIDE, MODULO,
+        PLUS, MINUS, MATCH, NOT_MATCH, DIVIDE, MODULO, BIT_AND, BIT_OR, BIT_XOR,
         ASSIGN_COLON, 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,
@@ -296,6 +296,9 @@ class MindsDBLexer(Lexer):
     NOT_MATCH = r'!~'
     DIVIDE = r'/'
     MODULO = r'%'
+    BIT_AND = r'&'
+    BIT_OR = r'\|'
+    BIT_XOR = r'\^'
     ASSIGN_COLON = r':='
     RIGHT_SHIFT = r'>>'
     LEFT_SHIFT = r'<<'

mindsdb_sql_parser/parser.py

@@ -50,6 +50,7 @@ class MindsDBParser(Parser):
         ('nonassoc', LESS, LEQ, GREATER, GEQ, IN, NOT_IN, BETWEEN, IS, IS_NOT, NOT_LIKE, LIKE, RIGHT_SHIFT, LEFT_SHIFT),
         ('left', JSON_GET),
         ('left', PLUS, MINUS),
+        ('left', BIT_AND, BIT_XOR, BIT_OR),
         ('left', STAR, DIVIDE, TYPECAST, MODULO),
         ('right', UMINUS),  # Unary minus operator, unary not
 
@@ -1631,6 +1632,9 @@ def star(self, p):
        'expr STAR expr',
        'expr DIVIDE expr',
        'expr MODULO expr',
+       'expr BIT_AND expr',
+       'expr BIT_XOR expr',
+       'expr BIT_OR expr',
        'expr ASSIGN_COLON expr',
        'expr EQUALS expr',
        'expr NEQUALS expr',

tests/test_base_sql/test_base_lexer.py

@@ -122,6 +122,10 @@ def test_binary_ops(self):
             ('<=', 'LEQ'),
             ('>>', 'RIGHT_SHIFT'),
             ('<<', 'LEFT_SHIFT'),
+            (':=', 'ASSIGN_COLON'),
+            ('&', 'BIT_AND'),
+            ('|', 'BIT_OR'),
+            ('^', 'BIT_XOR'),
             ('AND', 'AND'),
             ('OR', 'OR'),
             ('IS', 'IS'),

tests/test_base_sql/test_select_operations.py

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