[phpBT-dev] CVS: phpbt/inc/db oci8.php,1.17,1.18

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30944/inc/db

Modified Files:
	oci8.php 
Log Message:
Updated Oracle support.


Index: oci8.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- oci8.php	25 May 2005 18:04:48 -0000	1.17
+++ oci8.php	30 May 2005 19:59:35 -0000	1.18
@@ -43,7 +43,7 @@
 		'where s.site_id = b.site_id(+) group by s.site_id, site_name, '.
 		'sort_order order by %s %s',
 	'admin-list-statuses' => 'select s.status_id, status_name, status_desc, '.
-		'sort_order, count(bug_id) as bug_count '.
+		'sort_order, bug_open, count(bug_id) as bug_count '.
 		'from '.TBL_STATUS.' s, '.TBL_BUG.' b '.
 		'where s.status_id = b.status_id(+) '.
 		'group by s.status_id, status_name, status_desc, sort_order '.
@@ -115,12 +115,12 @@
 		'where p.project_id = pg.project_id(+) and active = 1 '.
 		'and (pg.project_id is null or pg.group_id in (%s)) '.
 		'group by p.project_id, p.project_name order by project_name',
-	'include-template-owner' => "SELECT sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 1, ".BUG_PROMOTED.", 1, ".BUG_ASSIGNED.", 1, ".BUG_REOPENED.", 1, 0 )), ".
-		"sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 0, ".BUG_PROMOTED.", 0, ".BUG_ASSIGNED.", 0, ".BUG_REOPENED.", 0, 1 )) ".
+	'include-template-owner' => SELECT sum(decode( s.status_id in (".OPEN_BUG_STATUSES.") , 1, 1, 0 )), ".
+		"sum(decode( s.status_id not in (".OPEN_BUG_STATUSES.") , 1, 1, 0 )), ".
 		'from '.TBL_BUG.' b, '.TBL_STATUS.' s '.
 		'where  b.status_id = s.status_id (+) and b.assigned_to = %s',
-	'include-template-reporter' => "SELECT sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 1, ".BUG_PROMOTED.", 1, ".BUG_ASSIGNED.", 1, ".BUG_REOPENED.", 1, 0 )), ".
-		"sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 0, ".BUG_PROMOTED.", 0, ".BUG_ASSIGNED.", 0, ".BUG_REOPENED.", 0, 1 )) ".
+	'include-template-reporter' => SELECT sum(decode( s.status_id in (".OPEN_BUG_STATUSES.") , 1, 1, 0 )) , ".
+		"sum(decode( s.status_id not in (".OPEN_BUG_STATUSES.") , 1, 1, 0 )) ".
 		'from '.TBL_BUG.' b, ' . TBL_STATUS.' s '.
 		'where  b.status_id = s.status_id (+) and b.created_by = %s',
 	'index-projsummary-1' => 'select b.project_id, p.project_name as "Project", '.