fix(sqlalchemy): properly handle aliases of extracted subqueries

ibis-project · Jan 11, 2024 · 38aaf8f · 38aaf8f
1 parent 5e1efe3
commit 38aaf8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ibis/backends/base/sql/alchemy/query_builder.py b/ibis/backends/base/sql/alchemy/query_builder.py
@@ -144,6 +144,11 @@ def _format_table(self, op):
         elif ctx.is_extracted(op):
             if isinstance(orig_op, ops.SelfReference):
                 result = ctx.get_ref(op)
+            elif isinstance(alias, str):
+                result = sa.table(
+                    alias,
+                    *translator._schema_to_sqlalchemy_columns(orig_op.schema),
+                )
             else:
                 result = alias
         else:

diff --git a/ibis/backends/base/sql/compiler/translator.py b/ibis/backends/base/sql/compiler/translator.py
@@ -113,12 +113,12 @@ def get_ref(self, node, search_parents=False):
         """Return the alias used to refer to an expression."""
         assert isinstance(node, ops.Node), type(node)
 
-        if self.is_extracted(node):
-            return self.top_context.table_refs.get(node)
-
         if (ref := self.table_refs.get(node)) is not None:
             return ref
 
+        if self.is_extracted(node):
+            return self.top_context.table_refs.get(node)
+
         if search_parents and (parent := self.parent) is not None:
             return parent.get_ref(node, search_parents=search_parents)