sql-testing-tools 0.1.7__tar.gz → 0.1.8__tar.gz

{sql_testing_tools-0.1.7 → sql_testing_tools-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_testing_tools
-Version: 0.1.7
+Version: 0.1.8
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3
@@ -12,6 +12,9 @@ A library that normalizes simple SQL queries and compares them first by equality
  [![Build and Test](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-build.yml/badge.svg)](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-build.yml)
  [![Build and Test](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-unittests.yml/badge.svg)](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-unittests.yml)
 
+### V 0.1.8
+- Fixed linebreak problems: Linebreaks are now converted into whitespaces before parsing where tokens
+
 ### V 0.1.6 + V 0.1.7
 - Fixed import error to ensure imports working in different environemnts
 

{sql_testing_tools-0.1.7 → sql_testing_tools-0.1.8}/setup.py

@@ -6,7 +6,7 @@ with open("sql_testing_tools/README.md", "r") as fh:
 
 setup(
     name='sql_testing_tools',
-    version='0.1.7',
+    version='0.1.8',
     packages=find_packages(),
     install_requires=[
         'sqlparse>=0.5.1',

{sql_testing_tools-0.1.7 → sql_testing_tools-0.1.8}/sql_testing_tools/TokenProcessing.py

@@ -1,14 +1,12 @@
 import sqlparse
 from sqlparse.sql import Identifier, IdentifierList, Where, Comparison, Function, Parenthesis
-from sqlparse.tokens import Keyword, DML, Name, Wildcard, Whitespace
+from sqlparse.tokens import Keyword, DML, Name, Wildcard, Whitespace, Newline
 
 try:
     import Helper as He
 except ImportError:
     from . import Helper as He
 
-
-
         
 #####################################
 #####################################
@@ -216,10 +214,11 @@ def _where(where, alias_map, baseDict: dict):
 
     isParanthesis = isinstance(where, Parenthesis)
     
+    where_tokens = [token for token in where.tokens if (token.ttype is not Whitespace and token.ttype is not Newline)and token.value != "WHERE"]    
+    where_string = " ".join([str(token) for token in where_tokens])
 
-    and_count = where.normalized.upper().count(" AND ")
-    or_count = where.normalized.upper().count(" OR ")
-
+    and_count = where_string.upper().count(" AND ")
+    or_count  = where_string.upper().count(" OR ")
 
     # No AND / OR
     if and_count + or_count == 0:
@@ -227,11 +226,10 @@ def _where(where, alias_map, baseDict: dict):
 
     # only ANDs / only ORs
     elif and_count == 0 or or_count == 0:
-        return _where_sameStrengthKeywords(where, alias_map, baseDict, " AND " if and_count > 0 else " OR ")
+        return _where_sameStrengthKeywords(where_tokens, alias_map, baseDict, " AND " if and_count > 0 else " OR ")
     
     # ANDs and ORs
 
-    where_tokens = [token for token in where.tokens if token.ttype is not Whitespace and token.value != "WHERE"]    
 
     # count keywords on top level
     top_and_count = count_keywordValues(where_tokens, ["AND"])
@@ -292,9 +290,9 @@ def _where_addBracketsAroundAND(where, alias_map, baseDict: dict):
 
 
 
-def _where_simpleCondition(where, alias_map, baseDict: dict):
+def _where_simpleCondition(where_tokens, alias_map, baseDict: dict):
     cond = []
-    for tok in where.tokens:
+    for tok in where_tokens:
         if isinstance(tok, Comparison):
             cond.append(_condition(tok, alias_map, baseDict))
         elif isinstance(tok, Parenthesis):
@@ -305,9 +303,9 @@ def _where_simpleCondition(where, alias_map, baseDict: dict):
                     tok = _tok
     return "".join(cond)
 
-def _where_sameStrengthKeywords(where, alias_map, baseDict: dict, keyword: str):
+def _where_sameStrengthKeywords(where_tokens, alias_map, baseDict: dict, keyword: str):
     cond = []
-    for tok in where.tokens:
+    for tok in where_tokens:
         if isinstance(tok, Comparison):
             cond.append(_condition(tok, alias_map, baseDict))
         elif isinstance(tok, Parenthesis):

{sql_testing_tools-0.1.7 → sql_testing_tools-0.1.8}/sql_testing_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sql_testing_tools
-Version: 0.1.7
+Version: 0.1.8
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3
@@ -12,6 +12,9 @@ A library that normalizes simple SQL queries and compares them first by equality
  [![Build and Test](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-build.yml/badge.svg)](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-build.yml)
  [![Build and Test](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-unittests.yml/badge.svg)](https://github.com/ValentinHerrmann/sql_testing_tools/actions/workflows/python-unittests.yml)
 
+### V 0.1.8
+- Fixed linebreak problems: Linebreaks are now converted into whitespaces before parsing where tokens
+
 ### V 0.1.6 + V 0.1.7
 - Fixed import error to ensure imports working in different environemnts