Merge branch 'master' into test/issue-253-regression

Author: macbre

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
         python-version: "3.12"
 
     - name: Install Poetry
-      uses: snok/install-poetry@v1.4.1
+      uses: snok/install-poetry@v1.4.2
       with:
         version: latest
         virtualenvs-create: true

.github/workflows/python-ci.yml

@@ -44,7 +44,7 @@ jobs:
 
     # https://github.com/marketplace/actions/install-poetry-action
     - name: Install Poetry
-      uses: snok/install-poetry@v1.4.1
+      uses: snok/install-poetry@v1.4.2
       with:
         version: latest
         virtualenvs-create: true

.github/workflows/python-publish.yml

@@ -25,7 +25,7 @@ jobs:
         python-version: '3.x'
 
     - name: Install Poetry
-      uses: snok/install-poetry@v1.4.1
+      uses: snok/install-poetry@v1.4.2
       with:
         virtualenvs-create: true
         virtualenvs-in-project: true

.github/workflows/type-check.yml

@@ -17,7 +17,7 @@ jobs:
         python-version: "3.12"
 
     - name: Install Poetry
-      uses: snok/install-poetry@v1.4.1
+      uses: snok/install-poetry@v1.4.2
       with:
         version: latest
         virtualenvs-create: true

poetry.lock

@@ -14,14 +14,14 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-sqlglot = "^30.7.0"
+sqlglot = "^30.12.0"
 
 [tool.poetry.group.dev.dependencies]
-coverage = {extras = ["toml"], version = "^7.13"}
-pytest = "^9.0.3"
+coverage = {extras = ["toml"], version = "^7.14"}
+pytest = "^9.1.1"
 pytest-cov = "^7.1.0"
 ruff = "^0.15"
-mypy = "^2.0"
+mypy = "^2.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -199,8 +199,12 @@ def add_alias(self, name: str, target: Any, clause: str) -> None:
         self.alias_names.append(name)
         if clause:
             self.alias_dict.setdefault(clause, UniqueList()).append(name)
-        if target is not None:
-            self.alias_map[name] = target
+        if target is None:
+            return
+        existing = self.alias_map.get(name, [])
+        merged = UniqueList(existing if isinstance(existing, list) else [existing])
+        merged.extend(target if isinstance(target, list) else [target])
+        self.alias_map[name] = merged if len(merged) > 1 else merged[0]
 
 
 # ---------------------------------------------------------------------------

sql_metadata/column_extractor.py

@@ -1,6 +1,41 @@
 from sql_metadata import Parser
 
 
+def test_union_column_aliases():
+    # https://github.com/macbre/sql-metadata/issues/401
+    # When UNION combines queries with the same alias,
+    # columns_aliases should aggregate all source columns
+    query = """
+    select a.A as M
+    from tab1 a
+    union all
+    select b.B as M
+    from tab2 b
+    """
+    parser = Parser(query)
+    assert parser.columns_aliases == {"M": ["tab1.A", "tab2.B"]}
+    assert parser.columns == ["tab1.A", "tab2.B"]
+    assert parser.tables == ["tab1", "tab2"]
+
+
+def test_union_alias_with_expression_targets():
+    # Regression: scalar then list-target must not nest
+    q1 = """
+    SELECT a AS x FROM t1
+    UNION ALL
+    SELECT b + c AS x FROM t2
+    """
+    assert Parser(q1).columns_aliases == {"x": ["a", "b", "c"]}
+
+    # Regression: list then list-target must not raise TypeError on UniqueList
+    q2 = """
+    SELECT a + b AS x FROM t1
+    UNION ALL
+    SELECT c + d AS x FROM t2
+    """
+    assert Parser(q2).columns_aliases == {"x": ["a", "b", "c", "d"]}
+
+
 def test_union():
     query = """
     SELECT