Standardize String Normalization and Case Sensitivity Issues fixed

Author: pankaj-bind

tests/test_mindsdb/test_create_view.py

@@ -2,6 +2,7 @@
 from mindsdb_sql_parser.ast.mindsdb import *
 from mindsdb_sql_parser.ast import *
 from mindsdb_sql_parser.lexer import MindsDBLexer
+from mindsdb_sql_parser.utils import to_single_line  # Added import
 
 class TestCreateView:
     def test_create_view_lexer(self):
@@ -21,8 +22,8 @@ def test_create_view_full(self):
                                   from_table=Identifier('integr'),
                                   query_str="SELECT * FROM pred")
 
-        assert str(ast).lower() == sql.lower()
-        assert str(ast) == str(expected_ast)
+        assert to_single_line(str(ast)) == to_single_line(sql)  # Standardized
+        assert to_single_line(str(ast)) == to_single_line(str(expected_ast))  # Standardized
         assert ast.to_tree() == expected_ast.to_tree()
 
     def test_create_view_nofrom(self):
@@ -31,7 +32,7 @@ def test_create_view_nofrom(self):
         expected_ast = CreateView(name=Identifier('my_view'),
                                   query_str="SELECT * FROM pred")
 
-        assert str(ast) == str(expected_ast)
+        assert to_single_line(str(ast)) == to_single_line(str(expected_ast))  # Standardized
         assert ast.to_tree() == expected_ast.to_tree()
 
     # def test_create_dataset_full(self):

tests/test_mindsdb/test_drop_dataset.py

@@ -1,13 +1,13 @@
 from mindsdb_sql_parser import parse_sql
 from mindsdb_sql_parser.ast.mindsdb import *
 from mindsdb_sql_parser.ast import *
-
+from mindsdb_sql_parser.utils import to_single_line  # Added import
 
 class TestDropDataset:
     def test_drop_dataset(self):
         sql = "DROP DATASET IF EXISTS dsname"
         ast = parse_sql(sql)
         expected_ast = DropDataset(name=Identifier('dsname'), if_exists=True)
-        assert str(ast).lower() == sql.lower()
-        assert str(ast) == str(expected_ast)
-        assert ast.to_tree() == expected_ast.to_tree()
+        assert to_single_line(str(ast)) == to_single_line(sql)  # Standardized
+        assert to_single_line(str(ast)) == to_single_line(str(expected_ast))  # Standardized
+        assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_evaluate.py

@@ -1,39 +1,38 @@
 import pytest
-
 from mindsdb_sql_parser import parse_sql
 from mindsdb_sql_parser.ast import *
 from mindsdb_sql_parser.ast.mindsdb.evaluate import Evaluate
 from mindsdb_sql_parser.lexer import MindsDBLexer
-
+from mindsdb_sql_parser.utils import to_single_line
 
 class TestEvaluate:
     def test_evaluate_lexer(self):
-        sql = "EVALUATE balanced_accuracy_score FROM (SELECT true, pred FROM table_1)"
+        sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1)"
         tokens = list(MindsDBLexer().tokenize(sql))
         assert tokens[0].type == 'EVALUATE'
         assert tokens[1].type == 'ID'
         assert tokens[1].value == 'balanced_accuracy_score'
 
     def test_evaluate_full_1(self):
-        sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1) USING adjusted=1, param2=2;"  #  noqa
+        sql = "EVALUATE balanced_accuracy_score FROM (SELECT ground_truth, pred FROM table_1) USING adjusted=1, param2=2;"
         ast = parse_sql(sql)
         expected_ast = Evaluate(
             name=Identifier('balanced_accuracy_score'),
             query_str="SELECT ground_truth, pred FROM table_1",
             using={'adjusted': 1, 'param2': 2},
         )
-        assert ' '.join(str(ast).split()).lower() == sql.lower()
+        assert to_single_line(str(ast)).lower() == to_single_line(sql).lower()  # Added .lower()
+        assert to_single_line(str(ast)).lower() == to_single_line(str(expected_ast)).lower()  # Added .lower()
         assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast) == str(expected_ast)
 
     def test_evaluate_full_2(self):
-        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
+        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"""
         sql = f"""EVALUATE r2_score FROM ({query_str});"""
         ast = parse_sql(sql)
         expected_ast = Evaluate(
             name=Identifier('r2_score'),
             query_str=query_str,
         )
-        assert ' '.join(str(ast).split()).lower() == sql.lower()
-        assert ast.to_tree() == expected_ast.to_tree()
-        assert str(ast).lower() == str(expected_ast).lower()
+        assert to_single_line(str(ast)).lower() == to_single_line(sql).lower()  # Added .lower()
+        assert to_single_line(str(ast)).lower() == to_single_line(str(expected_ast)).lower()  # Added .lower()
+        assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_knowledgebase.py

@@ -15,7 +15,7 @@
     Insert,
     OrderBy,
 )
-
+from mindsdb_sql_parser.utils import to_single_line  # Added import
 
 class TestKB:
 
@@ -36,6 +36,7 @@ def test_create_knowledge_base(self):
             from_select=None,
             params={},
         )
+        assert to_single_line(str(ast)) == to_single_line(str(expected_ast))  # Standardized
         assert ast == expected_ast
 
         # using the alias KNOWLEDGE BASE without underscore shall also work