Merge branch 'main' into materialization-job-strategy

DataJunction · Dec 6, 2023 · e1fabea · e1fabea
2 parents 650cba8 + e8a41d2
commit e1fabea
Show file tree

Hide file tree

Showing 20 changed files with 1,535 additions and 18 deletions.
diff --git a/datajunction-clients/python/tests/test_builder.py b/datajunction-clients/python/tests/test_builder.py
@@ -567,6 +567,9 @@ def test_get_dimensions(self, client):
         assert {
             "name": "foo.bar.dispatcher.company_name",
             "type": "string",
+            "node_name": "foo.bar.dispatcher",
+            "node_display_name": "Foo: Bar: Dispatcher",
+            "is_primary_key": False,
             "path": [
                 "foo.bar.repair_order_details.repair_order_id",
                 "foo.bar.repair_order.dispatcher_id",

diff --git a/datajunction-server/datajunction_server/models/node.py b/datajunction-server/datajunction_server/models/node.py
@@ -1108,6 +1108,9 @@ class DimensionAttributeOutput(SQLModel):
     """
 
     name: str
+    node_name: Optional[str]
+    node_display_name: Optional[str]
+    is_primary_key: bool
     type: ColumnType
     path: List[str]
 

diff --git a/datajunction-server/datajunction_server/sql/dag.py b/datajunction-server/datajunction_server/sql/dag.py
@@ -69,6 +69,10 @@ def get_dimensions(
                 dimensions.append(
                     DimensionAttributeOutput(
                         name=f"{current_node.name}.{column.name}",
+                        node_name=current_node.current.name,
+                        node_display_name=current_node.current.display_name,
+                        is_primary_key=column.name
+                        in {pk.name for pk in current_node.current.primary_key()},
                         type=column.type,
                         path=join_path_str,
                     ),