sql-error-categorizer 0.2.1__tar.gz → 0.2.3__tar.gz

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql_error_categorizer
-Version: 0.2.1
+Version: 0.2.3
 Summary: This project analyses SQL statements and labels possible errors or complications.
 Project-URL: Repository, https://github.com/DavidePonzini/sql_error_categorizer
 Project-URL: Documentation, https://sql-error-categorizer.readthedocs.io/en/latest/index.html
@@ -17,7 +17,7 @@ Requires-Dist: pyyaml
 Requires-Dist: sql-error-taxonomy
 Requires-Dist: sqlglot
 Requires-Dist: sqlparse
-Requires-Dist: sqlscope
+Requires-Dist: sqlscope>=1.0.14
 Requires-Dist: z3-solver
 Description-Content-Type: text/markdown
 

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sql_error_categorizer"
-version = "0.2.1"
+version = "0.2.3"
 authors = [
   { name="Davide Ponzini", email="davide.ponzini95@gmail.com" },
 ]
@@ -21,7 +21,7 @@ dependencies = [
     "pyyaml",
     "sqlparse",
     "sqlglot",
-    "sqlscope",
+    "sqlscope>=1.0.14",
     "sql_error_taxonomy",
     "z3-solver",
     "python-dateutil",

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/requirements.txt

@@ -5,7 +5,7 @@ sqlglot==28.0.0
 z3-solver
 python-dateutil
 sql_error_taxonomy>=1.0.1
-sqlscope
+sqlscope>=1.0.14
 
 # Dependencies for development
 ipython

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/src/sql_error_categorizer/detectors/complications.py

@@ -342,7 +342,7 @@ class ComplicationDetector(BaseDetector):
         checked_subqueries: set[str] = set()
 
         for select in self.query.selects:
-            for subquery, clause in select.subqueries:
+            for subquery, clause, depth in select.subqueries:
                 if subquery.sql in checked_subqueries:
                     continue
 

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/src/sql_error_categorizer/detectors/logical.py

@@ -448,8 +448,9 @@ class LogicalErrorDetector(BaseDetector):
         if extraneous_columns or missing_columns:
             return results  # skip AS check if column count is already wrong
 
-        expected_aliases: set[str] = set.intersection(*[set(col.name for col in sol.main_query.output.columns) for sol in self.solutions])
-        provided_aliases: set[str] = set(col.name for col in self.query.main_query.output.columns)
+        # only consider columns that are actually aliased
+        expected_aliases: set[str] = set.intersection(*[set(col.name for col in sol.main_query.output.columns if col.name != col.real_name and not col.name.startswith('_')) for sol in self.solutions])
+        provided_aliases: set[str] = set(col.name for col in self.query.main_query.output.columns if col.name != col.real_name and not col.name.startswith('_'))
 
         missing_aliases = expected_aliases - provided_aliases
 

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/src/sql_error_categorizer/detectors/syntax.py

@@ -967,7 +967,7 @@ class SyntaxErrorDetector(BaseDetector):
         results: list[DetectedError] = []
 
         for select in self.query.selects:
-            for subquery, clause in select.subqueries:
+            for subquery, clause, depth in select.subqueries:
                 if clause in ('FROM', 'EXISTS'):
                     continue    # FROM/EXISTS subqueries can have any number of columns
                 

{sql_error_categorizer-0.2.1 → sql_error_categorizer-0.2.3}/tests/3_log/test_073_missing_as_from_select.py

@@ -14,7 +14,21 @@ ERROR = SqlErrors.LOG_73_MISSING_AS_FROM_SELECT
         'SELECT cid, cname AS street FROM customer;',
         ['SELECT cid AS id, cname FROM customer;'],
         'miedema',
-        ['id', 'cname']
+        ['id']
+    ),
+
+    (
+        'SELECT cid, cname AS street FROM customer;',
+        ['SELECT cid AS id, cname AS street2 FROM customer;'],
+        'miedema',
+        ['id', 'street2']
+    ),
+    (
+        # aliased aggregate in solution (should trigger AS error)
+        'SELECT a AS b, COUNT(*) FROM table1 GROUP BY a;',
+        ['SELECT a AS b, COUNT(*) AS c FROM table1 GROUP BY a;'],
+        None,
+        ['c']
     )
     # subqueries -- Not applicable
     # CTEs -- Not applicable
@@ -54,6 +68,12 @@ def test_wrong(query, solutions, schema, expected):
         [],
         None,
     ),
+    (
+        # unaliased aggregate in solution (should not trigger AS error)
+        'SELECT a AS b, COUNT(*) AS c FROM table1 GROUP BY a;',
+        ['SELECT a AS b, COUNT(*) FROM table1 GROUP BY a;'],
+        None,
+    ),
     # subqueries -- Not applicable
     # CTEs -- Not applicable
 ])