Merge branch 'main' into fix-oracle

Author: ea-rus

mindsdb_sql_parser/ast/select/select.py

@@ -158,6 +158,8 @@ def get_string(self, *args, **kwargs):
                     ]
                     args_str = ', '.join(args)
                     value = f'{value.type}({args_str})'
+                if isinstance(value, Identifier):
+                    value = value.to_string()
                 else:
                     value = json.dumps(value)
 

tests/test_base_sql/test_select_structure.py

@@ -1326,13 +1326,15 @@ def test_lateral_join(self):
           INNER JOIN LATERAL (SELECT *
 			FROM table2 b
 			WHERE a.x=b.x
-			LIMIT 1) b ON true
+			LIMIT 1) b ON 1=1
         '''
 
         expected_ast = Select(
             targets=[Star()],
             from_table=Join(
-                condition=Constant(True),
+                condition=BinaryOperation(op='=', args=[
+                    Constant(1), Constant(1)
+                ]),
                 join_type='INNER JOIN LATERAL',
                 left=Identifier('table1', alias=Identifier('a')),
                 right=Select(

tests/test_mindsdb/test_selects.py

@@ -68,7 +68,7 @@ def test_select_using(self):
         sql = """
            SELECT status FROM tbl1
            group by 1
-           using p1=1, p2='2'
+           using p1=1, p2='2', p3=column
         """
         ast = parse_sql(sql)
         expected_ast = Select(
@@ -77,7 +77,8 @@ def test_select_using(self):
             group_by=[Constant(1)],
             using={
                 'p1': 1,
-                'p2': '2'
+                'p2': '2',
+                'p3': Identifier('column')
             }
         )