Merge pull request #1247 from mabel-dev/#1241

🪲 aliases not handled correctly #1241
mabel-dev · Nov 7, 2023 · cea14c5 · cea14c5
2 parents 3ad9c69 + ebdc282
commit cea14c5
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/opteryx/components/binder/binder_visitor.py b/opteryx/components/binder/binder_visitor.py
@@ -338,8 +338,19 @@ def name_column(qualifier, column):
                 ):
                     if projection_column.alias:
                         return projection_column.alias
-            if len(context.schemas) > 1 or needs_qualifier:
-                return f"{qualifier}.{column.name}"
+
+                    if len(context.relations) > 1 or needs_qualifier:
+                        if isinstance(projection_column, LogicalColumn):
+                            if qualifier:
+                                projection_column.sourcce = qualifier
+                            return projection_column.qualified_name
+                        return f"{qualifier}.{column.name}"
+
+                    if projection_column.query_column:
+                        return str(projection_column.query_column)
+                    if projection_column.current_name:
+                        return projection_column.current_name
+
             return column.name
 
         def keep_column(column, identities):