|
From: Benjamin C. <bc...@us...> - 2004-10-25 12:07:47
|
Update of /cvsroot/phpbt/phpbt/inc/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28250/inc/db Modified Files: mysql.php oci8.php pgsql.php Log Message: Merging in htmltemplates branch to HEAD Index: mysql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mysql.php 24 Jul 2003 04:47:13 -0000 1.18 +++ mysql.php 25 Oct 2004 12:07:01 -0000 1.19 @@ -50,7 +50,7 @@ 'bug-history' => 'select bh.*, login '. 'from '.TBL_BUG_HISTORY.' bh '. 'left join '. TBL_AUTH_USER.' on bh.created_by = user_id '. - 'where bug_id = %s', + 'where bug_id = %s order by bh.created_date', 'bug-cc-list' => 'select email '. 'from '.TBL_BUG_CC.' left join '. TBL_AUTH_USER.' u using(user_id), '. TBL_USER_PREF.' p '. Index: oci8.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- oci8.php 21 Jun 2003 13:36:30 -0000 1.15 +++ oci8.php 25 Oct 2004 12:07:01 -0000 1.16 @@ -39,7 +39,7 @@ 'group by d.database_id, database_name, sort_order '. 'order by %s %s', 'admin-list-sites' => 'select s.site_id, site_name, sort_order, '. - 'count(bug_id) as bug_count from '.TBL_SITE. ' s, '.TBL_BUG. + 'count(bug_id) as bug_count from '.TBL_SITE. ' s, '.TBL_BUG.' b '. '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, '. @@ -54,7 +54,7 @@ 'and group_name <> \'User\'', 'bug-history' => 'select bh.*, login '. 'from '.TBL_BUG_HISTORY.' bh, '.TBL_AUTH_USER . - ' where user_id = bh.created_by(+) and bug_id = %s', + ' where user_id = bh.created_by(+) and bug_id = %s order by bh.created_date', 'bug-cc-list' => 'select email '. 'from '.TBL_BUG_CC.' bc, ' . TBL_AUTH_USER.' u, ' . TBL_USER_PREF.' p '. 'where u.user_id = bc.user_id(+) and u.user_id = p.user_id '. Index: pgsql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pgsql.php 21 Jun 2003 13:36:30 -0000 1.24 +++ pgsql.php 25 Oct 2004 12:07:01 -0000 1.25 @@ -6,7 +6,7 @@ 'from '.TBL_AUTH_GROUP.' ag '. 'left join '.TBL_USER_GROUP.' ug using (group_id) '. 'left join '.TBL_AUTH_USER.' using (user_id) '. - 'group by ag.group_id, group_name, locked '. + 'group by ag.group_id, group_name, locked, assignable '. 'order by %s %s', 'admin-list-oses' => 'select s.os_id, os_name, regex, sort_order, '. 'count(bug_id) as bug_count '. @@ -51,7 +51,7 @@ 'bug-history' => 'select bh.*, login '. 'from '.TBL_BUG_HISTORY.' bh '. 'left join '. TBL_AUTH_USER.' on bh.created_by = user_id '. - 'where bug_id = %s', + 'where bug_id = %s order by bh.created_date', 'bug-cc-list' => 'select email '. 'from '.TBL_BUG_CC.' left join '. TBL_AUTH_USER.' u using(user_id), '. TBL_USER_PREF.' p '. |