datajunction-server 0.0.1a65.dev0__tar.gz → 0.0.1a65.dev2__tar.gz

{datajunction_server-0.0.1a65.dev0 → datajunction_server-0.0.1a65.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a65.dev0
+Version: 0.0.1a65.dev2
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

datajunction_server-0.0.1a65.dev2/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a65.dev2"

{datajunction_server-0.0.1a65.dev0 → datajunction_server-0.0.1a65.dev2}/datajunction_server/sql/parsing/ast.py

@@ -4,7 +4,6 @@
 import collections
 import decimal
 import logging
-import time
 from abc import ABC, abstractmethod
 from concurrent.futures import ThreadPoolExecutor
 from copy import deepcopy
@@ -2651,6 +2650,29 @@ class Query(TableExpression, UnNamed):
         if self._is_compiled:
             return
 
+        def _compile(info: Tuple[Column, List[TableExpression]]):
+            """
+            Given a list of table sources, find a matching origin table for the column.
+            """
+            col, table_options = info
+            matching_origin_tables = 0
+            for option in table_options:
+                namespace = col.namespace[0].name if col.namespace else None
+                table_alias = option.alias.name if option.alias else None
+                if not namespace or (namespace and namespace == table_alias):
+                    result = option.add_reference_column(col)
+                    if result:
+                        matching_origin_tables += 1
+                        col._is_compiled = True
+            if matching_origin_tables > 1:
+                ctx.exception.errors.append(
+                    DJError(
+                        code=ErrorCode.INVALID_COLUMN,
+                        message=f"Column `{col.name.name}` found in multiple tables."
+                        " Consider using fully qualified name.",
+                    ),
+                )
+
         # Work backwards from the table expressions on the query's SELECT clause
         # and assign references between the columns and the tables
         nearest_query = self.get_nearest_parent_of_type(Query)
@@ -2671,15 +2693,6 @@ class Query(TableExpression, UnNamed):
                 await table_options[idx].compile(ctx)
 
             tp = ThreadPoolExecutor()
-
-            def shortcut_compile(info: Tuple[Column, List[TableExpression]]):
-                col, table_options = info
-                for option in table_options:
-                    result = option.add_reference_column(col)
-                    if result:
-                        col._is_compiled = True
-                        break
-
             expressions_to_compile = [
                 self.select.projection,
                 self.select.group_by,
@@ -2700,7 +2713,7 @@ class Query(TableExpression, UnNamed):
 
             list(
                 tp.map(
-                    shortcut_compile,
+                    _compile,
                     [(col, table_options) for col in columns_to_compile],
                 ),
             )

{datajunction_server-0.0.1a65.dev0 → datajunction_server-0.0.1a65.dev2}/tests/construction/compile_test.py

@@ -151,6 +151,7 @@ async def test_raise_on_compile_node_with_no_query(construction_session: AsyncSe
 
 
 @pytest.mark.asyncio
+@pytest.mark.skip(reason="DJ should not validate query correctness")
 async def test_raise_on_unjoinable_automatic_dimension_groupby(
     construction_session: AsyncSession,
 ):

datajunction_server-0.0.1a65.dev0/datajunction_server/__about__.py

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a65.dev0"