further refactoring of ambiguous graphid col in sql fns, re #11396

archesproject · Aug 23, 2024 · 9bf43f3 · 9bf43f3
1 parent aa4b4e3
commit 9bf43f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/arches/app/models/migrations/8009_etlmodule.py b/arches/app/models/migrations/8009_etlmodule.py
@@ -176,7 +176,7 @@
             (select alias from nodes where nodeid = nodegroup_id) as path,
             cardinality
         FROM
-        (SELECT ng.nodegroupid, ng.parentnodegroupid, alias, name, cardinality, graphid FROM node_groups ng
+        (SELECT ng.nodegroupid, ng.parentnodegroupid, n.alias, n.name, ng.cardinality, n.graphid FROM node_groups ng
         INNER JOIN nodes n ON ng.nodegroupid = n.nodeid
         ORDER by ng.nodegroupid) AS root
         WHERE nodegroupid = nodegroup_id
@@ -190,7 +190,7 @@
                 path || ' - ' || parent.alias,
                 parent.cardinality
             FROM
-            (SELECT ng.nodegroupid, ng.parentnodegroupid, alias, name, cardinality, graphid FROM node_groups ng
+            (SELECT ng.nodegroupid, ng.parentnodegroupid, n.alias, n.name, ng.cardinality, n.graphid FROM node_groups ng
             INNER JOIN nodes n ON ng.nodegroupid = n.nodeid
             ORDER by ng.nodegroupid) AS parent
             INNER JOIN nodegroup_tree nt ON nt.nodegroupid = parent.parentnodegroupid