Index: openacs-4/packages/bug-tracker/tcl/bug-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs-oracle.xql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/bug-tracker/tcl/bug-procs-oracle.xql	6 Jul 2016 09:01:02 -0000	1.10
+++ openacs-4/packages/bug-tracker/tcl/bug-procs-oracle.xql	23 Nov 2017 16:41:46 -0000	1.11
@@ -3,29 +3,8 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-  <fullquery name="bug_tracker::bug::get.select_bug_data">
-    <querytext>
-      select b.bug_id,
-             b.project_id,
-             b.bug_number,
-             b.summary,
-             b.component_id,
-             b.creation_date,
-             to_char(b.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_pretty,
-             b.resolution,
-             b.user_agent,
-             b.found_in_version,
-             b.found_in_version,
-             b.fix_for_version,
-             b.fixed_in_version,
-             to_char(sysdate, 'YYYY-MM-DD HH24:MI:SS') as now_pretty
-      from   bt_bugs b
-      where  b.bug_id = :bug_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="bug_tracker::bug::update.update_bug">
-    <querytext>
+   <fullquery name="bug_tracker::bug::update.update_bug">
+     <querytext>
         begin
             :1 := bt_bug_revision.new (
                 bug_revision_id =>  null,
@@ -42,210 +21,30 @@
                 creation_ip =>      :creation_ip
             );
         end;
-    </querytext>
-  </fullquery>
+     </querytext>
+   </fullquery>
 
-  <fullquery name="bug_tracker::bug::insert.select_sysdate">
-    <querytext>
-        select sysdate from dual
-    </querytext>
-  </fullquery>
-
-
-<fullquery name="bug_tracker::bug::delete.delete_bug_case">
-    <querytext> 
+   <fullquery name="bug_tracker::bug::delete.delete_bug_case">
+     <querytext> 
         begin
              workflow_case_pkg.delete(:case_id);
         end;
-    </querytext>
-</fullquery>
+     </querytext>
+   </fullquery>
  
-<fullquery name="bug_tracker::bug::delete.delete_notification">
-    <querytext>
-        begin
-             notification.delete(:notification_id);
-        end;
-    </querytext>
-</fullquery>
-
-<fullquery name="bug_tracker::bug::delete.delete_cr_item">
-    <querytext>
-        begin
-             content_item.delete(:bug_id);
-        end;
-    </querytext>
-</fullquery>
-
-  <partialquery name="bug_tracker::bug::get_list.category_where_clause">
-      <querytext>
+   <partialquery name="bug_tracker::bug::get_list.category_where_clause">
+     <querytext>
          content_keyword.is_assigned(b.bug_id, :f_category_$parent_id, 'none') = 't'
-      </querytext>
-  </partialquery>
+     </querytext>
+   </partialquery>
 
-
-  <partialquery name="bug_tracker::bug::get_query.orderby_category_from_bug_clause">
-      <querytext>
-         , cr_item_keyword_map km_order,
-         cr_keywords kw_order
-      </querytext>
-  </partialquery>
- 
-  <partialquery name="bug_tracker::bug::get_query.orderby_category_where_clause">
-      <querytext>
-           and km_order.item_id (+) = b.bug_id
-           and km_order.keyword_id = kw_order.keyword_id 
-           and kw_order.parent_id = '[db_quote $orderby_parent_id]'
-      </querytext>
-  </partialquery>
-
-<!-- bd: the inline view assign_info returns names
-     of assignees as well as pretty_names of assigned actions.
-     I'm left-outer-joining against this view.
-
-     WARNING: In the query below I assume there can be at most one
-     person assigned to a bug.  If more people are assigned you will get
-     multiple rows per bug in the result set.  Current bug tracker
-     doesn't have UI for creating such conditions. If you add UI that
-     allows user to break this assumption you'll also need to deal with
-     this.
--->
-<fullquery name="bug_tracker::bug::get_query.bugs_pagination">
-  <querytext>
-    select b.bug_id,
-         b.project_id,
-         b.bug_number,
-         b.summary,
-         lower(b.summary) as lower_summary,
-         b.comment_content,
-         b.comment_format,
-         b.component_id,
-         b.creation_date,
-         to_char(b.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_pretty,
-         b.creation_user as submitter_user_id,
-         submitter.first_names as submitter_first_names,
-         submitter.last_name as submitter_last_name,
-         submitter.email as submitter_email,
-         lower(submitter.first_names) as lower_submitter_first_names,
-         lower(submitter.last_name) as lower_submitter_last_name,
-         lower(submitter.email) as lower_submitter_email,
-         st.pretty_name as pretty_state,
-         st.short_name as state_short_name,
-         st.state_id,
-         st.hide_fields,
-         b.resolution,
-         b.found_in_version,
-         b.fix_for_version,
-         b.fixed_in_version,
-         cas.case_id
-         $more_columns
-    from $from_bug_clause,
-         acs_users_all submitter,
-         workflow_cases cas,
-         workflow_case_fsm cfsm,
-         workflow_fsm_states st 
-    where submitter.user_id = b.creation_user
-      and cas.workflow_id = :workflow_id
-      and cas.object_id = b.bug_id
-      and cfsm.case_id = cas.case_id
-      and cfsm.parent_enabled_action_id is null
-      and st.state_id = cfsm.current_state 
-    $orderby_category_where_clause
-    [template::list::filter_where_clauses -and -name "bugs"]
-    [template::list::orderby_clause -orderby -name "bugs"]
-  </querytext>
-</fullquery>
-
-<fullquery name="bug_tracker::bug::get_query.bugs">
-  <querytext>
-select q.*,
-       km.keyword_id,
-       assign_info.*
-from (
-  select b.bug_id,
-         b.project_id,
-         b.bug_number,
-         b.summary,
-         lower(b.summary) as lower_summary,
-         b.comment_content,
-         b.comment_format,
-         b.component_id,
-         b.creation_date,
-         to_char(b.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_pretty,
-         b.creation_user as submitter_user_id,
-         submitter.first_names as submitter_first_names,
-         submitter.last_name as submitter_last_name,
-         submitter.email as submitter_email,
-         lower(submitter.first_names) as lower_submitter_first_names,
-         lower(submitter.last_name) as lower_submitter_last_name,
-         lower(submitter.email) as lower_submitter_email,
-         st.pretty_name as pretty_state,
-         st.short_name as state_short_name,
-         st.state_id,
-         st.hide_fields,
-         b.resolution,
-         b.found_in_version,
-         b.fix_for_version,
-         b.fixed_in_version,
-         cas.case_id
-         $more_columns
-    from $from_bug_clause,
-         acs_users_all submitter,
-         workflow_cases cas,
-         workflow_case_fsm cfsm,
-         workflow_fsm_states st 
-   where submitter.user_id = b.creation_user
-     and cas.workflow_id = :workflow_id
-     and cas.object_id = b.bug_id
-     and cfsm.case_id = cas.case_id
-     and cfsm.parent_enabled_action_id is null
-     and st.state_id = cfsm.current_state 
-   $orderby_category_where_clause
-   [template::list::page_where_clause -and -name bugs -key bug_id]
-) q,
-  cr_item_keyword_map km,
-  (select cru.user_id as assigned_user_id,
-          aa.action_id,
-          aa.case_id,
-          wa.pretty_name as action_pretty_name,
-          p.first_names as assignee_first_names,
-          p.last_name as assignee_last_name
-     from workflow_case_assigned_actions aa,
-          workflow_case_role_user_map cru,
-          workflow_actions wa,
-          persons p
-    where aa.case_id = cru.case_id
-      and aa.role_id = cru.role_id
-      and cru.user_id = p.person_id
-      and wa.action_id = aa.action_id
-  ) assign_info
-where q.bug_id = km.item_id (+)
-  and q.case_id = assign_info.case_id (+)
-[template::list::orderby_clause -orderby -name "bugs"]
-
-  </querytext>
-</fullquery>
-
-  <partialquery name="bug_tracker::bug::get_list.filter_assignee_null_where_clause">
-      <querytext>
-          exists (select 1
-                  from   workflow_case_assigned_actions aa,
-                         workflow_case_role_party_map wcrpm
-                  where  aa.case_id = cas.case_id
-                  and    aa.action_id = $action_id
-                  and    wcrpm.case_id (+) = aa.case_id
-                  and    wcrpm.role_id (+) = aa.role_id
-                  and    wcrpm.party_id is null
-                 )
-      </querytext>
-  </partialquery>
-
-  <partialquery name="bug_tracker::user_bugs_only_where_clause.user_bugs_only">
-      <querytext>
+   <partialquery name="bug_tracker::user_bugs_only_where_clause.user_bugs_only">
+     <querytext>
        and exists (select 1
                      from acs_object_party_privilege_map
                     where object_id = b.bug_id
                       and party_id = :user_id
                       and privilege = 'read')
-      </querytext>
-  </partialquery>
+     </querytext>
+   </partialquery>
 </queryset>