From 9bf43f3e4ba8ce3f4686c8e55f6994bf29ffad05 Mon Sep 17 00:00:00 2001 From: Galen Date: Fri, 23 Aug 2024 16:28:06 -0700 Subject: [PATCH] further refactoring of ambiguous graphid col in sql fns, re #11396 --- arches/app/models/migrations/8009_etlmodule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arches/app/models/migrations/8009_etlmodule.py b/arches/app/models/migrations/8009_etlmodule.py index 86d0f3f4ef8..03abe2199b3 100644 --- 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