sql-error-categorizer 0.2.2__tar.gz → 0.2.4__tar.gz

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/Makefile

@@ -14,6 +14,9 @@ endif
 
 .PHONY: install build uninstall documentation test upload download clean coverage
 
+install: uninstall build
+	$(VENV_BIN)/python -m pip install ./dist/*.whl
+
 $(VENV):
 	python -m venv --clear $(VENV)
 	touch -a $(REQUIREMENTS)
@@ -22,10 +25,6 @@ $(VENV):
 $(VENV)_upgrade: $(VENV)
 	$(VENV_BIN)/python -m pip install --upgrade -r $(REQUIREMENTS)
 
-
-install: uninstall build
-	$(VENV_BIN)/python -m pip install ./dist/*.whl
-
 build: $(VENV)
 	rm -rf dist/
 	$(VENV_BIN)/python -m build

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql_error_categorizer
-Version: 0.2.2
+Version: 0.2.4
 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.15
 Requires-Dist: z3-solver
 Description-Content-Type: text/markdown
 

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/pyproject.toml

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

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/requirements.txt

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

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/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.2 → sql_error_categorizer-0.2.4}/src/sql_error_categorizer/detectors/syntax.py

@@ -259,6 +259,10 @@ class SyntaxErrorDetector(BaseDetector):
                 continue
 
             for column in select.ast.find_all(exp.Column):
+                # skip `table.*` syntax, we only want to check actual column references
+                if isinstance(column.this, exp.Star):
+                    continue
+
                 column_name = util.ast.column.get_name(column)
                 table_name = util.ast.column.get_table(column)
 
@@ -403,6 +407,10 @@ class SyntaxErrorDetector(BaseDetector):
                 continue
 
             for column in select.ast.find_all(exp.Column):
+                # skip `table.*` syntax, we only want to check actual column references
+                if isinstance(column.this, exp.Star):
+                    continue
+
                 column = deepcopy(column)  # avoid modifying the original AST until we are sure we want to apply the correction
                 column_str = column.sql()
                 column_name = util.ast.column.get_name(column)

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/tests/1_syn/test_002_ambiguous_column.py

@@ -25,6 +25,7 @@ def test_wrong(query, column, table_aliases, schema):
 
 @pytest.mark.parametrize('query,schema', [
     ('SELECT s.street FROM store s, customer c;', 'miedema'),
+    ('SELECT s.* FROM store s, customer c;', 'miedema'),
     # subqueries
     ('SELECT * FROM store s, customer c WHERE cid IN (SELECT s2.street FROM store s2, customer c2);', 'miedema'),
     # CTEs

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/tests/3_log/test_070_extraneous_column_in_select.py

@@ -90,6 +90,18 @@ def test_wrong(query, solutions, schema, search_path, expected_len, expected_col
         [],
         None,
     ),
+    (
+        # SELECT t.*
+        'SELECT sid, sname, s.street, s.city FROM store s, customer;',
+        ['SELECT store.* FROM store;'],
+        'miedema',
+    ),
+    (
+        # SELECT t.* - inversed
+        'SELECT store.* FROM store;',
+        ['SELECT sid, sname, s.street, s.city FROM store s, customer;'],
+        'miedema',
+    ),
     # subqueries
     (
         'SELECT a, (SELECT b FROM table2) as sub_col FROM table1;',

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/tests/3_log/test_071_missing_column_from_select.py

@@ -84,6 +84,18 @@ def test_wrong(query, solutions, schema, search_path, expected_len, expected_col
         ['SELECT cid FROM customer;'],
         'miedema',
     ),
+    (
+        # SELECT t.*
+        'SELECT sid, sname, s.street, s.city FROM store s, customer;',
+        ['SELECT store.* FROM store;'],
+        'miedema',
+    ),
+    (
+        # SELECT t.* - inversed
+        'SELECT store.* FROM store;',
+        ['SELECT sid, sname, s.street, s.city FROM store s, customer;'],
+        'miedema',
+    ),
     (
         # no solutions (return no errors)
         'SELECT a, b, c FROM table1;',

{sql_error_categorizer-0.2.2 → sql_error_categorizer-0.2.4}/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
 ])