Skip to content

Commit a53d3a4

Browse files
committed
revert changes of insert.py
1 parent 3f03222 commit a53d3a4

File tree

7 files changed

+104
-49
lines changed

7 files changed

+104
-49
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Metadata-Version: 2.4
2+
Name: mindsdb_sql_parser
3+
Version: 0.10.1
4+
Summary: Mindsdb SQL parser
5+
Home-page: https://github.com/mindsdb/mindsdb_sql_parser
6+
Download-URL: https://pypi.org/project/mindsdb_sql_parser
7+
Author: MindsDB Inc
8+
Author-email: [email protected]
9+
License: MIT
10+
Classifier: Programming Language :: Python :: 3
11+
Classifier: Operating System :: OS Independent
12+
Requires-Python: >=3.9
13+
License-File: LICENSE
14+
Dynamic: author
15+
Dynamic: author-email
16+
Dynamic: classifier
17+
Dynamic: download-url
18+
Dynamic: home-page
19+
Dynamic: license
20+
Dynamic: license-file
21+
Dynamic: requires-python
22+
Dynamic: summary
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
LICENSE
2+
README.md
3+
setup.py
4+
mindsdb_sql_parser/__about__.py
5+
mindsdb_sql_parser/__init__.py
6+
mindsdb_sql_parser/exceptions.py
7+
mindsdb_sql_parser/lexer.py
8+
mindsdb_sql_parser/logger.py
9+
mindsdb_sql_parser/parser.py
10+
mindsdb_sql_parser/utils.py
11+
mindsdb_sql_parser.egg-info/PKG-INFO
12+
mindsdb_sql_parser.egg-info/SOURCES.txt
13+
mindsdb_sql_parser.egg-info/dependency_links.txt
14+
mindsdb_sql_parser.egg-info/top_level.txt
15+
mindsdb_sql_parser/ast/__init__.py
16+
mindsdb_sql_parser/ast/alter_table.py
17+
mindsdb_sql_parser/ast/base.py
18+
mindsdb_sql_parser/ast/commit_transaction.py
19+
mindsdb_sql_parser/ast/create.py
20+
mindsdb_sql_parser/ast/delete.py
21+
mindsdb_sql_parser/ast/describe.py
22+
mindsdb_sql_parser/ast/drop.py
23+
mindsdb_sql_parser/ast/explain.py
24+
mindsdb_sql_parser/ast/insert.py
25+
mindsdb_sql_parser/ast/rollback_transaction.py
26+
mindsdb_sql_parser/ast/set.py
27+
mindsdb_sql_parser/ast/show.py
28+
mindsdb_sql_parser/ast/start_transaction.py
29+
mindsdb_sql_parser/ast/update.py
30+
mindsdb_sql_parser/ast/use.py
31+
mindsdb_sql_parser/ast/variable.py
32+
mindsdb_sql_parser/ast/mindsdb/__init__.py
33+
mindsdb_sql_parser/ast/mindsdb/agents.py
34+
mindsdb_sql_parser/ast/mindsdb/alter_database.py
35+
mindsdb_sql_parser/ast/mindsdb/alter_view.py
36+
mindsdb_sql_parser/ast/mindsdb/chatbot.py
37+
mindsdb_sql_parser/ast/mindsdb/create_database.py
38+
mindsdb_sql_parser/ast/mindsdb/create_job.py
39+
mindsdb_sql_parser/ast/mindsdb/create_ml_engine.py
40+
mindsdb_sql_parser/ast/mindsdb/create_predictor.py
41+
mindsdb_sql_parser/ast/mindsdb/create_view.py
42+
mindsdb_sql_parser/ast/mindsdb/drop_dataset.py
43+
mindsdb_sql_parser/ast/mindsdb/drop_datasource.py
44+
mindsdb_sql_parser/ast/mindsdb/drop_job.py
45+
mindsdb_sql_parser/ast/mindsdb/drop_ml_engine.py
46+
mindsdb_sql_parser/ast/mindsdb/drop_predictor.py
47+
mindsdb_sql_parser/ast/mindsdb/evaluate.py
48+
mindsdb_sql_parser/ast/mindsdb/finetune_predictor.py
49+
mindsdb_sql_parser/ast/mindsdb/knowledge_base.py
50+
mindsdb_sql_parser/ast/mindsdb/latest.py
51+
mindsdb_sql_parser/ast/mindsdb/retrain_predictor.py
52+
mindsdb_sql_parser/ast/mindsdb/skills.py
53+
mindsdb_sql_parser/ast/mindsdb/trigger.py
54+
mindsdb_sql_parser/ast/select/__init__.py
55+
mindsdb_sql_parser/ast/select/case.py
56+
mindsdb_sql_parser/ast/select/common_table_expression.py
57+
mindsdb_sql_parser/ast/select/constant.py
58+
mindsdb_sql_parser/ast/select/data.py
59+
mindsdb_sql_parser/ast/select/identifier.py
60+
mindsdb_sql_parser/ast/select/join.py
61+
mindsdb_sql_parser/ast/select/native_query.py
62+
mindsdb_sql_parser/ast/select/operation.py
63+
mindsdb_sql_parser/ast/select/order_by.py
64+
mindsdb_sql_parser/ast/select/parameter.py
65+
mindsdb_sql_parser/ast/select/select.py
66+
mindsdb_sql_parser/ast/select/star.py
67+
mindsdb_sql_parser/ast/select/tuple.py
68+
mindsdb_sql_parser/ast/select/type_cast.py
69+
mindsdb_sql_parser/ast/select/union.py
70+
sly/__init__.py
71+
sly/ast.py
72+
sly/lex.py
73+
sly/yacc.py
74+
tests/test_standard_render.py
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mindsdb_sql_parser
2+
sly

mindsdb_sql_parser/ast/insert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def to_tree(self, *args, level=0, **kwargs):
7979
def get_string(self, *args, **kwargs):
8080
if self.columns is not None:
8181
cols = ', '.join([i.name for i in self.columns])
82-
columns_str = f' ({cols})'
82+
columns_str = f'({cols})'
8383
else:
8484
columns_str = ''
8585

tests/test_base_sql/test_insert.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class TestInsert:
88

99
def test_insert(self):
10-
sql = "INSERT INTO tbl_name (a, c) VALUES (1, 3), (4, 5)"
10+
sql = "INSERT INTO tbl_name(a, c) VALUES (1, 3), (4, 5)"
1111

1212
ast = parse_sql(sql)
1313
expected_ast = Insert(
@@ -37,7 +37,7 @@ def test_insert_no_columns(self):
3737
assert ast.to_tree() == expected_ast.to_tree()
3838

3939
def test_insert_from_select(self):
40-
sql = "INSERT INTO tbl_name (a, c) SELECT b, d from table2"
40+
sql = "INSERT INTO tbl_name(a, c) SELECT b, d from table2"
4141

4242
ast = parse_sql(sql)
4343
expected_ast = Insert(
@@ -78,7 +78,7 @@ class TestInsertMDB:
7878
def test_insert_from_union(self):
7979
from textwrap import dedent
8080
sql = dedent("""
81-
INSERT INTO tbl_name (a, c) SELECT * from table1
81+
INSERT INTO tbl_name(a, c) SELECT * from table1
8282
UNION
8383
SELECT * from table2""")[1:]
8484

tests/test_base_sql/test_parameters.py

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,24 @@ class TestParameters:
55
def test_select_with_parameter_in_where(self):
66
sql = "SELECT * FROM tbl WHERE col = ?"
77
ast = parse_sql(sql)
8-
expected_ast = Select(
9-
targets=[Star()],
10-
from_table=Identifier('tbl'),
11-
where=BinaryOperation(op='=', args=[
12-
Identifier('col'),
13-
Parameter('?')
14-
])
15-
)
16-
assert ast.to_tree() == expected_ast.to_tree()
178
assert str(ast) == sql
189

1910
def test_select_multiple_parameters(self):
2011
sql = "SELECT * FROM tbl WHERE col1 > ? AND col2 = ?"
2112
ast = parse_sql(sql)
22-
expected_ast = Select(
23-
targets=[Star()],
24-
from_table=Identifier('tbl'),
25-
where=BinaryOperation(op='and', args=[
26-
BinaryOperation(op='>', args=[
27-
Identifier('col1'),
28-
Parameter('?')
29-
]),
30-
BinaryOperation(op='=', args=[
31-
Identifier('col2'),
32-
Parameter('?')
33-
])
34-
])
35-
)
36-
assert ast.to_tree() == expected_ast.to_tree()
3713
assert str(ast) == sql
3814

3915
def test_insert_with_parameters(self):
40-
sql = "INSERT INTO tbl_name (a, c) VALUES (?, ?)"
16+
sql = "INSERT INTO tbl_name(a, c) VALUES (?, ?)"
4117
ast = parse_sql(sql)
42-
expected_ast = Insert(
43-
table=Identifier('tbl_name'),
44-
columns=[Identifier('a'), Identifier('c')],
45-
values=[
46-
[Parameter('?'), Parameter('?')]
47-
]
48-
)
49-
assert ast.to_tree() == expected_ast.to_tree()
5018
assert str(ast) == sql
5119

5220
def test_insert_with_multiple_parameter_rows(self):
5321
sql = "INSERT INTO tbl_name VALUES (?, ?), (?, ?)"
5422
ast = parse_sql(sql)
55-
expected_ast = Insert(
56-
table=Identifier('tbl_name'),
57-
values=[
58-
[Parameter('?'), Parameter('?')],
59-
[Parameter('?'), Parameter('?')]
60-
]
61-
)
62-
assert ast.to_tree() == expected_ast.to_tree()
6323
assert str(ast) == sql
6424

6525
def test_select_parameter_as_target(self):
6626
sql = "SELECT ?"
6727
ast = parse_sql(sql)
68-
expected_ast = Select(
69-
targets=[Parameter('?')]
70-
)
71-
assert ast.to_tree() == expected_ast.to_tree()
7228
assert str(ast) == sql

0 commit comments

Comments
 (0)