Merge pull request #48 from mindsdb/fix-in

Fix query with single value in IN

Author: ea-rus

mindsdb_sql_parser/ast/select/operation.py

@@ -1,14 +1,19 @@
 from mindsdb_sql_parser.ast.base import ASTNode
 from mindsdb_sql_parser.exceptions import ParsingException
 from mindsdb_sql_parser.utils import indent
-
+from mindsdb_sql_parser.ast.select.tuple import Tuple
 
 class Operation(ASTNode):
     def __init__(self, op, args, *args_, **kwargs):
         super().__init__(*args_, **kwargs)
 
         self.op = ' '.join(op.lower().split())
-        self.args = list(args)
+        self.args = []
+        for item in args:
+            if isinstance(item, ASTNode) and item.parentheses:
+                item.parentheses = False
+                item = Tuple([item])
+            self.args.append(item)
         self.assert_arguments()
 
     def assert_arguments(self):

tests/test_base_sql/test_select_structure.py

@@ -681,6 +681,18 @@ def test_in_tuple(self):
         assert ast.to_tree() == expected_ast.to_tree()
         assert str(ast) == str(expected_ast)
 
+        sql = "SELECT col FROM tab WHERE col in (1)"
+        ast = parse_sql(sql)
+        expected_ast = Select(targets=[Identifier(parts=['col'])],
+                              from_table=Identifier(parts=['tab']),
+                              where=BinaryOperation(op='in',
+                                                    args=(
+                                                        Identifier(parts=['col']),
+                                                        Tuple(items=[Constant(1)])
+                                                    )))
+        assert ast.to_tree() == expected_ast.to_tree()
+        assert str(ast) == str(expected_ast)
+
     def test_count_distinct(self):
         sql = "SELECT COUNT(DISTINCT survived) AS uniq_survived FROM titanic"
         ast = parse_sql(sql)