Merge branch 'mindsdb:main' into fix-issue-49

Author: pankaj-bind

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 self.op in ("in", "not in") and isinstance(item, ASTNode) and item.parentheses:
+                item.parentheses = False
+                item = Tuple([item])
+            self.args.append(item)
         self.assert_arguments()
 
     def assert_arguments(self):

mindsdb_sql_parser/parser.py

@@ -199,6 +199,7 @@ def drop_agent(self, p):
         return DropAgent(name=p.identifier, if_exists=p.if_exists_or_empty)
 
     @_('UPDATE AGENT identifier SET kw_parameter_list')
+    @_('ALTER AGENT identifier USING kw_parameter_list')
     def update_agent(self, p):
         return UpdateAgent(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})
 

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)
@@ -1351,4 +1363,27 @@ def test_lateral_join(self):
         )
         ast = parse_sql(query)
         assert str(ast) == str(expected_ast)
-        assert ast.to_tree() == expected_ast.to_tree()
+        assert ast.to_tree() == expected_ast.to_tree()
+
+    def test_many_conditions(self):
+        sql = """
+            select * from kb where
+               (content like 'white' and size='small') 
+            or (content = 'big')
+        """
+        ast = parse_sql(sql)
+        expected_ast = Select(
+            targets=[Star()],
+            from_table=Identifier(parts=['kb']),
+            where=BinaryOperation(op='or', args=[
+                    BinaryOperation(op='and', args=[
+                        BinaryOperation(op='like', args=[Identifier('content'), Constant('white')]),
+                        BinaryOperation(op='=', args=[Identifier('size'), Constant('small')]),
+                    ], parentheses=True),
+                    BinaryOperation(op='=', args=[Identifier('content'), Constant('big')], parentheses=True),
+                ]
+            )
+        )
+        assert ast.to_tree() == expected_ast.to_tree()
+        assert str(ast) == str(expected_ast)
+

tests/test_mindsdb/test_agents.py

@@ -44,6 +44,14 @@ def test_update_agent(self):
         assert str(ast) == str(expected_ast)
         assert ast.to_tree() == expected_ast.to_tree()
 
+        sql = '''
+            alter agent my_agent
+            USING
+            model = 'new_model',
+            skills = ['new_skill1', 'new_skill2']
+        '''
+        ast = parse_sql(sql)
+
         # Parse again after rendering to catch problems with rendering.
         ast = parse_sql(str(ast))
         assert str(ast) == str(expected_ast)