sql-testing-tools 0.2.2__tar.gz → 0.2.3__tar.gz

{sql_testing_tools-0.2.2 → sql_testing_tools-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sql_testing_tools
-Version: 0.2.2
+Version: 0.2.3
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3
@@ -18,6 +18,10 @@ A library that normalizes simple SQL queries and compares them first by equality
 
 Submit bug reports and features requests at: https://github.com/ValentinHerrmann/sql_testing_tools
 
+### V 0.2.3
+- fix: ASC/DESC in ORDER BY (also with multiple columns and order directions), no direction treated as ASC
+- Verified that ; and whitespaces, linebreaks at end of query are ignored
+
 ### V 0.2.2 
 - Support LIKE
 - Support '<=' and '>=' (geq and leq)
@@ -36,6 +40,7 @@ Submit bug reports and features requests at: https://github.com/ValentinHerrmann
 
 ### V 0.1.4 + V 0.1.5
 - Chained conditions (with AND,OR and Paranthesises) in WHERE statement
+- Aggregate Functions
 
 ### V 0.1.3
 - SELECT: columns with our without table prefix

{sql_testing_tools-0.2.2 → sql_testing_tools-0.2.3}/README.md

@@ -8,6 +8,10 @@ A library that normalizes simple SQL queries and compares them first by equality
 
 Submit bug reports and features requests at: https://github.com/ValentinHerrmann/sql_testing_tools
 
+### V 0.2.3
+- fix: ASC/DESC in ORDER BY (also with multiple columns and order directions), no direction treated as ASC
+- Verified that ; and whitespaces, linebreaks at end of query are ignored
+
 ### V 0.2.2 
 - Support LIKE
 - Support '<=' and '>=' (geq and leq)
@@ -26,6 +30,7 @@ Submit bug reports and features requests at: https://github.com/ValentinHerrmann
 
 ### V 0.1.4 + V 0.1.5
 - Chained conditions (with AND,OR and Paranthesises) in WHERE statement
+- Aggregate Functions
 
 ### V 0.1.3
 - SELECT: columns with our without table prefix

{sql_testing_tools-0.2.2 → sql_testing_tools-0.2.3}/setup.py

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

{sql_testing_tools-0.2.2 → sql_testing_tools-0.2.3}/sql_testing_tools/TokenProcessing.py

@@ -2,6 +2,7 @@ import sqlparse
 from sqlparse.sql import Identifier, IdentifierList, Where, Comparison, Function, Parenthesis
 from sqlparse.tokens import Keyword, DML, Name, Wildcard, Whitespace, Newline
 
+
 try:
     import Helper as He
 except ImportError:
@@ -96,10 +97,21 @@ def _groupby(groupby_, alias_map, baseDict: dict):
 def _orderby(orderby_, alias_map, baseDict: dict):
     orderby_tokens = []
     if isinstance(orderby_, Identifier):
-        orderby_tokens.append(_identifier(orderby_, alias_map, baseDict).lower())
+        if len(orderby_.tokens) > 0 and orderby_.tokens[-1].ttype==Keyword.Order:
+            for tok in orderby_.tokens:
+                if isinstance(tok, Identifier):
+                    orderby_tokens.append(_identifier(tok, alias_map, baseDict).lower())
+                if tok.ttype==Keyword.Order:
+                    orderby_tokens[-1] += (" "+tok.value)
+        else:
+            orderby_tokens.append(_identifier(orderby_, alias_map, baseDict).lower())
+            orderby_tokens[-1] += " ASC"
     elif isinstance(orderby_, IdentifierList):
-        for identifier in orderby_.get_identifiers():
-            orderby_tokens.append(_identifier(identifier, alias_map, baseDict).lower())
+        for tok in orderby_.tokens:
+            if isinstance(tok, Identifier):
+                orderby_tokens.append(_identifier(tok, alias_map, baseDict).lower())
+    #elif isinstance(orderby_, Order):
+    #    pass
    # orderby_tokens.sort()
     return ",".join(orderby_tokens)
 

{sql_testing_tools-0.2.2 → sql_testing_tools-0.2.3}/sql_testing_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sql_testing_tools
-Version: 0.2.2
+Version: 0.2.3
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3
@@ -18,6 +18,10 @@ A library that normalizes simple SQL queries and compares them first by equality
 
 Submit bug reports and features requests at: https://github.com/ValentinHerrmann/sql_testing_tools
 
+### V 0.2.3
+- fix: ASC/DESC in ORDER BY (also with multiple columns and order directions), no direction treated as ASC
+- Verified that ; and whitespaces, linebreaks at end of query are ignored
+
 ### V 0.2.2 
 - Support LIKE
 - Support '<=' and '>=' (geq and leq)
@@ -36,6 +40,7 @@ Submit bug reports and features requests at: https://github.com/ValentinHerrmann
 
 ### V 0.1.4 + V 0.1.5
 - Chained conditions (with AND,OR and Paranthesises) in WHERE statement
+- Aggregate Functions
 
 ### V 0.1.3
 - SELECT: columns with our without table prefix