Skip to content

Commit 16c9401

Browse files
authored
Merge pull request #35 from pankaj-bind/fix-24
Standardize String Normalization Fixed
2 parents 0a72349 + 4a7057e commit 16c9401

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from mindsdb_sql_parser import parse_sql
22
from mindsdb_sql_parser.ast.mindsdb import *
33
from mindsdb_sql_parser.ast import *
4-
4+
from mindsdb_sql_parser.utils import to_single_line
55

66
class TestDropDataset:
77
def test_drop_dataset(self):
88
sql = "DROP DATASET IF EXISTS dsname"
99
ast = parse_sql(sql)
1010
expected_ast = DropDataset(name=Identifier('dsname'), if_exists=True)
11-
assert str(ast).lower() == sql.lower()
12-
assert str(ast) == str(expected_ast)
13-
assert ast.to_tree() == expected_ast.to_tree()
11+
assert to_single_line(str(ast)) == to_single_line(sql)
12+
assert to_single_line(str(ast)) == to_single_line(str(expected_ast))
13+
assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_evaluate.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
import pytest
2-
32
from mindsdb_sql_parser import parse_sql
43
from mindsdb_sql_parser.ast import *
54
from mindsdb_sql_parser.ast.mindsdb.evaluate import Evaluate
65
from mindsdb_sql_parser.lexer import MindsDBLexer
7-
6+
from mindsdb_sql_parser.utils import to_single_line
87

98
class TestEvaluate:
109
def test_evaluate_lexer(self):
11-
sql = "EVALUATE balanced_accuracy_score FROM (SELECT true, pred FROM table_1)"
10+
sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1)"
1211
tokens = list(MindsDBLexer().tokenize(sql))
1312
assert tokens[0].type == 'EVALUATE'
1413
assert tokens[1].type == 'ID'
1514
assert tokens[1].value == 'balanced_accuracy_score'
1615

1716
def test_evaluate_full_1(self):
18-
sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1) USING adjusted=1, param2=2;" # noqa
17+
sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1) USING adjusted=1, param2=2;"
1918
ast = parse_sql(sql)
2019
expected_ast = Evaluate(
2120
name=Identifier('balanced_accuracy_score'),
2221
query_str="SELECT ground_truth, pred FROM table_1",
2322
using={'adjusted': 1, 'param2': 2},
2423
)
25-
assert ' '.join(str(ast).split()).lower() == sql.lower()
24+
assert to_single_line(str(ast)).lower() == to_single_line(sql).lower()
25+
assert to_single_line(str(ast)).lower() == to_single_line(str(expected_ast)).lower()
2626
assert ast.to_tree() == expected_ast.to_tree()
27-
assert str(ast) == str(expected_ast)
2827

2928
def test_evaluate_full_2(self):
30-
query_str = """SELECT t.rental_price as ground_truth, m.rental_price as prediction FROM example_db.demo_data.home_rentals as t JOIN mindsdb.home_rentals_model as m limit 100""" # noqa
29+
query_str = """SELECT t.rental_price as ground_truth, m.rental_price as prediction FROM example_db.demo_data.home_rentals as t JOIN mindsdb.home_rentals_model as m limit 100"""
3130
sql = f"""EVALUATE r2_score FROM ({query_str});"""
3231
ast = parse_sql(sql)
3332
expected_ast = Evaluate(
3433
name=Identifier('r2_score'),
3534
query_str=query_str,
3635
)
37-
assert ' '.join(str(ast).split()).lower() == sql.lower()
38-
assert ast.to_tree() == expected_ast.to_tree()
39-
assert str(ast).lower() == str(expected_ast).lower()
36+
assert to_single_line(str(ast)).lower() == to_single_line(sql).lower()
37+
assert to_single_line(str(ast)).lower() == to_single_line(str(expected_ast)).lower()
38+
assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_knowledgebase.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
from mindsdb_sql_parser.ast.mindsdb.knowledge_base import *
12
from mindsdb_sql_parser import parse_sql, Variable
23
from mindsdb_sql_parser.ast.mindsdb.knowledge_base import (
34
CreateKnowledgeBase,
45
DropKnowledgeBase,
5-
EvaluateKnowledgeBase
66
)
77
from mindsdb_sql_parser.ast import (
88
Select,
@@ -16,7 +16,7 @@
1616
Insert,
1717
OrderBy,
1818
)
19-
19+
from mindsdb_sql_parser.utils import to_single_line
2020

2121
class TestKB:
2222

@@ -37,6 +37,7 @@ def test_create_knowledge_base(self):
3737
from_select=None,
3838
params={},
3939
)
40+
assert to_single_line(str(ast)) == to_single_line(str(expected_ast))
4041
assert ast == expected_ast
4142

4243
# using the alias KNOWLEDGE BASE without underscore shall also work

0 commit comments

Comments
 (0)