Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-oracle.xql,v
diff -u -N -r1.1 -r1.1.32.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-oracle.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-oracle.xql	2 Jan 2020 17:29:20 -0000	1.1.32.1
@@ -17,15 +17,4 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="select_basic_info">      
-      <querytext>
-      
-    select acs_group.name(:group_id) as group_name
-      from dual
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-postgresql.xql,v
diff -u -N -r1.4 -r1.4.32.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-postgresql.xql	4 Dec 2001 00:20:47 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-postgresql.xql	2 Jan 2020 17:29:20 -0000	1.4.32.1
@@ -19,15 +19,4 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="select_basic_info">      
-      <querytext>
-      
-    select acs_group__name(:group_id) as group_name
-      
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl,v
diff -u -N -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	16 May 2019 09:54:29 -0000	1.7.2.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	2 Jan 2020 17:29:20 -0000	1.7.2.2
@@ -41,7 +41,10 @@
 # Select out all relationship types
 db_multirow rel_types select_relation_types {}
 
-db_1row select_basic_info {}
+set group_name [db_string select_basic_info {
+    select group_name from groups
+    where group_id = :group_id
+}]
 
 ad_return_template
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-oracle.xql	15 May 2001 16:59:00 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="select_props">      
-      <querytext>
-      
-    select acs_group.name(:group_id) as group_name,
-           t.pretty_name as rel_type_pretty_name
-      from acs_object_types t
-     where t.object_type = :rel_type
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-postgresql.xql	15 May 2001 16:59:00 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="select_props">      
-      <querytext>
-      
-    select acs_group__name(:group_id) as group_name,
-           t.pretty_name as rel_type_pretty_name
-      from acs_object_types t
-     where t.object_type = :rel_type
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	2 Jan 2020 17:36:08 -0000	1.6.2.1
@@ -23,7 +23,13 @@
 set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one group_id] "One Group"] "Add constraint"]
 set export_vars [export_vars -form {group_id rel_type return_url}]
 
-db_1row select_props {}
+db_1row select_props {
+    select (select group_name from groups
+            where group_id = :group_id) as group_name,
+           t.pretty_name as rel_type_pretty_name
+      from acs_object_types t
+     where t.object_type = :rel_type
+}
 
 ad_return_template