Index: openacs-4/packages/workflow/tcl/case-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs-oracle.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/workflow/tcl/case-procs-oracle.xql	21 Nov 2017 13:05:13 -0000	1.12
+++ openacs-4/packages/workflow/tcl/case-procs-oracle.xql	3 Sep 2019 12:23:55 -0000	1.13
@@ -2,43 +2,6 @@
 <queryset>
   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-  <fullquery name="workflow::case::role::get_assignees_not_cached.select_assignees">
-    <querytext>
-        select m.party_id, 
-               p.email,
-               acs_object.name(m.party_id) as name
-        from   workflow_case_role_party_map m,
-               parties p
-        where  m.case_id = :case_id
-        and    m.role_id = :role_id
-        and    p.party_id = m.party_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="workflow::case::action::notify.select_object_name">
-    <querytext>
-        select acs_object.name(:object_id) as name from dual
-    </querytext>
-   </fullquery>
-
-  <partialquery name="workflow::case::role::get_search_query.select_search_results">
-    <querytext>
-        select distinct acs_object.name(p.party_id) || ' (' || p.email || ')' as label, p.party_id
-        from   [ad_decode $subquery "" "cc_users" $subquery] p
-        where  upper(nvl(acs_object.name(p.party_id) || ' ', '')  || p.email) like upper('%'||:value||'%')
-        order  by label
-    </querytext>
-  </partialquery>
-
-  <fullquery name="workflow::case::role::get_picklist.select_options">
-    <querytext>
-        select acs_object.name(p.party_id) || ' (' || p.email || ')'  as label, p.party_id
-        from   parties p
-        where  p.party_id in ([join $party_id_list ", "])
-        order  by label
-    </querytext>
-  </fullquery>
-
    <fullquery name="workflow::case::delete.delete_case">
     <querytext>
         begin
Index: openacs-4/packages/workflow/tcl/case-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs-postgresql.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/workflow/tcl/case-procs-postgresql.xql	21 Nov 2017 13:05:13 -0000	1.13
+++ openacs-4/packages/workflow/tcl/case-procs-postgresql.xql	3 Sep 2019 12:23:55 -0000	1.14
@@ -2,43 +2,6 @@
 <queryset>
   <rdbms><type>postgresql</type><version>7.2</version></rdbms>
 
-  <fullquery name="workflow::case::role::get_assignees_not_cached.select_assignees">
-    <querytext>
-        select m.party_id, 
-               p.email,
-               acs_object__name(m.party_id) as name
-        from   workflow_case_role_party_map m,
-               parties p
-        where  m.case_id = :case_id
-        and    m.role_id = :role_id
-        and    p.party_id = m.party_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="workflow::case::action::notify.select_object_name">
-    <querytext>
-        select acs_object__name(:object_id) as name
-    </querytext>
-   </fullquery>
-
-   <partialquery name="workflow::case::role::get_search_query.select_search_results">
-    <querytext>
-        select distinct acs_object__name(p.party_id) || ' (' || p.email || ')' as label, p.party_id
-        from   [ad_decode $subquery "" "cc_users" $subquery] p
-        where  upper(coalesce(acs_object__name(p.party_id) || ' ', '')  || p.email) like upper('%'||:value||'%')
-        order  by label
-    </querytext>
-  </partialquery>
-
-  <fullquery name="workflow::case::role::get_picklist.select_options">
-    <querytext>
-        select acs_object__name(p.party_id) || ' (' || p.email || ')'  as label, p.party_id
-        from   parties p
-        where  p.party_id in ([join $party_id_list ", "])
-        order  by label
-    </querytext>
-  </fullquery>
-
   <fullquery name="workflow::case::delete.delete_case">
     <querytext>
 	select workflow_case_pkg__delete(:case_id)
Index: openacs-4/packages/workflow/tcl/case-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs.xql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/workflow/tcl/case-procs.xql	21 Nov 2017 13:05:13 -0000	1.16
+++ openacs-4/packages/workflow/tcl/case-procs.xql	3 Sep 2019 12:23:55 -0000	1.17
@@ -1,6 +1,43 @@
 <?xml version="1.0"?>
 <queryset>
 
+  <fullquery name="workflow::case::action::notify.select_object_name">
+    <querytext>
+        select acs_object.name(:object_id) as name from dual
+    </querytext>
+  </fullquery>
+
+  <partialquery name="workflow::case::role::get_search_query.select_search_results">
+    <querytext>
+        select distinct acs_object.name(p.party_id) || ' (' || p.email || ')' as label, p.party_id
+        from   [ad_decode $subquery "" "cc_users" $subquery] p
+        where  upper(coalesce(acs_object.name(p.party_id) || ' ', '')  || p.email) like upper('%'||:value||'%')
+        order  by label
+    </querytext>
+  </partialquery>
+
+  <fullquery name="workflow::case::role::get_picklist.select_options">
+    <querytext>
+        select acs_object.name(p.party_id) || ' (' || p.email || ')'  as label, p.party_id
+        from   parties p
+        where  p.party_id in ([join $party_id_list ", "])
+        order  by label
+    </querytext>
+  </fullquery>
+
+  <fullquery name="workflow::case::role::get_assignees_not_cached.select_assignees">
+    <querytext>
+        select m.party_id,
+               p.email,
+               acs_object.name(m.party_id) as name
+        from   workflow_case_role_party_map m,
+               parties p
+        where  m.case_id = :case_id
+        and    m.role_id = :role_id
+        and    p.party_id = m.party_id
+    </querytext>
+  </fullquery>
+
   <fullquery name="workflow::case::insert.select_initial_state">
     <querytext>
       select state_id