Menu
▾
▴
[phpBT-dev] CVS: phpbt/inc/db mssql.php,1.3,1.4 mysql.php,1.26,1.27 oci8.php,1.19,1.20 pgsql.php,1.27,1.28
|
From: Ulf E. <ulf...@us...> - 2005-08-23 21:12:49
|
Update of /cvsroot/phpbt/phpbt/inc/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23167/phpbt/inc/db Modified Files: mssql.php mysql.php oci8.php pgsql.php Log Message: Updates Index: mssql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mssql.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mssql.php 23 Aug 2005 21:09:42 -0000 1.3 +++ mssql.php 23 Aug 2005 21:12:39 -0000 1.4 @@ -9,6 +9,7 @@ 'c.component_name, '. 'c.created_date, '. 'c.active, '. + 'sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_COMPONENT.' c '. @@ -40,8 +41,7 @@ 'ag.group_id, '. 'group_name, '. 'locked, '. - 'count(ug.group_id) as count, '. - 'assignable '. + 'count(ug.group_id) as count '. 'from '. TBL_AUTH_GROUP.' ag '. 'left join '.TBL_USER_GROUP.' ug on ug.group_id = ag.group_id '. @@ -49,8 +49,7 @@ 'group by '. 'ag.group_id, '. 'group_name, '. - 'locked, '. - 'assignable '. + 'locked '. 'order by '. '%s %s', 'admin-list-oses' => @@ -70,6 +69,25 @@ 'sort_order '. 'order by '. '%s %s', + 'admin-list-priorities' => + 'select '. + 'p.priority_id, '. + 'priority_name, '. + 'priority_desc, '. + 'priority_color, '. + 'sort_order, '. + 'count(bug_id) as bug_count '. + 'from '. + TBL_PRIORITY.' p '. + 'left join '.TBL_BUG.' b on b.priority = p.priority_id '. + 'group by '. + 'p.priority_id, '. + 'priority_name, '. + 'priority_desc, '. + 'priority_color, '. + 'sort_order '. + 'order by '. + '%s %s', 'admin-list-resolutions' => 'select '. 's.resolution_id, '. @@ -145,6 +163,7 @@ 'v.version_name, '. 'v.created_date, '. 'v.active, '. + 'sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_VERSION.' v '. @@ -207,14 +226,21 @@ 'bh.created_date', 'bug-prev-next' => 'select '. - 'bug_id, '. + 'b.bug_id, '. 'reporter.login as reporter, '. - 'owner.login as owner '. + 'owner.login as owner, '. + 'count(distinct comment.comment_id) as comments, '. + 'count(distinct attachment.attachment_id) as attachments, '. + 'count(distinct vote.user_id) as votes '. 'from '. TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '. + 'left join '.TBL_COMMENT.' comment on b.bug_id = comment.bug_id '. + 'left join '.TBL_ATTACHMENT.' attachment on b.bug_id = attachment.bug_id '. + 'left join '.TBL_BUG_VOTE.' vote on b.bug_id = vote.bug_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '. 'left join '.TBL_DATABASE.' db on b.database_id = db.database_id '. 'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '. @@ -222,12 +248,14 @@ TBL_SEVERITY.' severity, '. TBL_STATUS.' status, '. TBL_OS.' os, '. + TBL_PRIORITY.' priority, '. TBL_VERSION.' version, '. TBL_COMPONENT.' component, '. TBL_PROJECT.' project, '. TBL_SITE.' site '. 'where '. 'b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. 'and b.version_id = version.version_id '. @@ -235,10 +263,12 @@ 'and b.project_id = project.project_id '. 'and %s '. 'and b.site_id = site.site_id '. - 'and bug_id <> %s '. + 'and b.bug_id <> %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. - 'bug_id asc', + 'b.bug_id asc', 'bug-printable' => 'select '. 'b.*, '. @@ -248,6 +278,7 @@ 'component_name, '. 'version_name, '. 'severity_name, '. + 'priority_name, '. 'os_name, '. 'status_name, '. 'resolution_name '. @@ -255,17 +286,20 @@ TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. TBL_OS.' os, '. TBL_VERSION.' v, '. + TBL_PRIORITY.' priority, '. TBL_COMPONENT.' c, '. TBL_PROJECT.' p '. 'where '. - 'bug_id = %s '. + 'b.bug_id = %s '. 'and b.project_id not in (%s) '. 'and b.severity_id = sv.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.os_id = os.os_id '. 'and b.version_id = v.version_id '. 'and b.component_id = c.component_id '. @@ -282,16 +316,19 @@ TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. - TBL_SITE.' site '. + TBL_SITE.' site, '. + TBL_PRIORITY.' prio '. 'where '. - 'bug_id = %s '. + 'b.bug_id = %s '. 'and b.project_id not in (%s) '. 'and b.site_id = site.site_id '. 'and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id', + 'and b.status_id = st.status_id'. + 'and b.priority = prio.priority_id', 'functions-bug-cc' => 'select '. 'b.user_id, '. @@ -316,6 +353,18 @@ 'p.project_name '. 'order by '. 'project_name', + 'include-template-bookmark' => + "SELECT ". + "sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ), ". + "sum(CASE WHEN s.status_id not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ". + "from ". + TBL_BUG." b ". + "left join ".TBL_STATUS." s on s.status_id = b.status_id ". + TBL_BOOKMARK." w ". + "where ". + "w.user_id=%s ". + "AND w.bug_id = b.bug_id", + 'include-template-owner' => "SELECT ". "sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ), ". @@ -362,6 +411,10 @@ 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '. + 'left join '.TBL_COMMENT.' comment on b.bug_id = comment.bug_id '. + 'left join '.TBL_ATTACHMENT.' attachment on b.bug_id = attachment.bug_id '. + 'left join '.TBL_BUG_VOTE.' vote on b.bug_id = vote.bug_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '. 'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '. 'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '. @@ -372,25 +425,30 @@ TBL_SITE.' site, '. TBL_VERSION.' version, '. TBL_COMPONENT.' component, '. - TBL_PROJECT.' project '. + TBL_PROJECT.' project, '. + TBL_PRIORITY.' priority '. 'where '. 'b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. 'and b.site_id = site.site_id '. 'and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. 'and b.project_id = project.project_id %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. - 'bug_id asc', + 'b.bug_id asc', 'query-list-bugs-count' => 'select '. 'count(*) '. 'from '. TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. - 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id ', + 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id ', 'query-list-bugs-count-join' => 'where ', 'report-resbyeng-1' => Index: mysql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mysql.php 23 Aug 2005 21:09:42 -0000 1.26 +++ mysql.php 23 Aug 2005 21:12:39 -0000 1.27 @@ -264,7 +264,7 @@ 'and %s '. 'and b.site_id = site.site_id '. 'and b.bug_id <> %s '. - 'GROUP BY '. + 'group by '. 'b.bug_id '. 'order by '. '%s %s, '. @@ -327,7 +327,7 @@ 'and b.project_id not in (%s) '. 'and b.site_id = site.site_id '. 'and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id ', + 'and b.status_id = st.status_id '. 'and b.priority = prio.priority_id', 'functions-bug-cc' => 'select '. @@ -435,7 +435,7 @@ 'and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. 'and b.project_id = project.project_id %s '. - 'GROUP BY '. + 'group by '. 'b.bug_id '. 'order by '. '%s %s, '. Index: oci8.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- oci8.php 23 Aug 2005 21:09:42 -0000 1.19 +++ oci8.php 23 Aug 2005 21:12:39 -0000 1.20 @@ -9,6 +9,7 @@ 'component_name, '. 'c.created_date, '. 'active, '. + 'sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_COMPONENT.' c, '. @@ -43,11 +44,10 @@ 'ag.group_id, '. 'ag.group_name, '. 'ag.locked, '. - 'count(ug.group_id) as count, '. - 'assignable '. + 'count(ug.group_id) as count '. 'from '. TBL_AUTH_GROUP.' ag, '. - TBL_USER_GROUP.' ug,'. + TBL_USER_GROUP.' ug, '. TBL_AUTH_USER.' au '. 'where '. 'ag.group_id = ug.group_id(+) '. @@ -55,8 +55,7 @@ 'group by '. 'ag.group_id, '. 'ag.group_name, '. - 'ag.locked, '. - 'ag.assignable '. + 'ag.locked '. 'order by '. '%s %s', 'admin-list-oses' => @@ -78,6 +77,27 @@ 's.sort_order '. 'order by '. 's.%s %s', + 'admin-list-priorities' => + 'select '. + 'p.priority_id, '. + 'p.priority_name, '. + 'p.priority_desc, '. + 'p.priority_color, '. + 'p.sort_order, '. + 'count(b.bug_id) as bug_count '. + 'from '. + TBL_PRIORITY.' p, '. + TBL_BUG.' b '. + 'where '. + 'p.priority_id = b.priority(+) '. + 'group by '. + 'p.priority_id, '. + 'p.priority_name, '. + 'p.priority_desc, '. + 'p.priority_color, '. + 'p.sort_order '. + 'order by '. + 'p.%s %s', 'admin-list-resolutions' => 'select '. 's.resolution_id, '. @@ -90,8 +110,13 @@ TBL_BUG.' b '. 'where '. 's.resolution_id = b.resolution_id(+) '. - 'group by s.resolution_id, resolution_name, resolution_desc, sort_order '. - 'order by %s %s', + 'group by '. + 's.resolution_id, '. + 'resolution_name, '. + 'resolution_desc, '. + 'sort_order '. + 'order by '. + '%s %s', 'admin-list-severities' => 'select '. 's.severity_id, '. @@ -156,6 +181,7 @@ 'version_name, '. 'v.created_date, '. 'active, '. + 'sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_VERSION.' v, '. @@ -226,12 +252,19 @@ 'select '. 'b.bug_id, '. 'reporter.login as reporter, '. - 'owner.login as owner '. + 'owner.login as owner, '. + 'count(distinct comment.comment_id) as comments, '. + 'count(distinct attachment.attachment_id) as attachments, '. + 'count(distinct vote.user_id) as votes '. 'from '. TBL_BUG.' b, '. TBL_AUTH_USER.' owner, '. TBL_AUTH_USER.' reporter, '. TBL_AUTH_USER.' lastmodifier, '. + TBL_COMMENT.' comment, '. + TBL_ATTACHMENT.' attachment, '. + TBL_BUG_VOTE.' vote, '. + TBL_BOOKMARK.' bookmark, '. TBL_RESOLUTION.' resolution, '. TBL_DATABASE.' database, '. TBL_VERSION.' version2, '. @@ -239,6 +272,7 @@ TBL_SEVERITY.' severity, '. TBL_STATUS.' status, '. TBL_OS.' os, '. + TBL_PRIORITY.' priority, '. TBL_VERSION.' version, '. TBL_COMPONENT.' component, '. TBL_PROJECT.' project, '. @@ -247,18 +281,26 @@ 'b.assigned_to = owner.user_id(+) '. 'and b.created_by = reporter.user_id(+) '. 'and b.last_modified_by = lastmodifier.user_id(+) '. + 'and b.bug_id = comment.bug_id(+) '. + 'and b.bug_id = attachment.bug_id(+) '. + 'and b.bug_id = vote.bug_id(+) '. + 'and b.bug_id = bookmark.bug_id(+) '. 'and b.resolution_id = resolution.resolution_id(+) '. 'and b.database_id = database.database_id(+) '. 'and b.to_be_closed_in_version_id = version2.version_id(+) '. 'and b.closed_in_version_id = version3.version_id(+) '. 'and b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. 'and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. - 'and b.site_id = site.site_id '. 'and b.project_id = project.project_id '. - 'and %s and bug_id <> %s '. + 'and %s '. + 'and b.site_id = site.site_id '. + 'and b.bug_id <> %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. 'bug_id asc', @@ -278,49 +320,57 @@ TBL_BUG.' b, '. TBL_AUTH_USER.' owner, '. TBL_AUTH_USER.' reporter, '. + TBL_BOOKMARK.' bookmark, '. TBL_RESOLUTION.' r, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. TBL_OS.' os, '. TBL_VERSION.' v, '. + TBL_PRIORITY.' priority, '. TBL_COMPONENT.' c, '. - TBL_PROJECT.' p ', + TBL_PROJECT.' p '. 'where '. 'b.assigned_to = owner.user_id(+) '. 'and b.created_by = reporter.user_id(+) '. + 'and b.bug_id = bookmark.bug_id(+) '. 'and b.resolution_id = r.resolution_id(+) '. + 'and b.bug_id = %s '. + 'and b.project_id not in (%s)'. + 'and b.severity_id = sv.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.os_id = os.os_id '. 'and b.version_id = v.version_id '. 'and b.component_id = c.component_id '. 'and b.project_id = p.project_id '. - 'and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id '. - 'and bug_id = %s '. - 'and b.project_id not in (%s)', + 'and b.status_id = st.status_id ', 'bug-show-bug' => 'select '. 'b.*, '. 'reporter.login as reporter, '. 'owner.login as owner, '. - 'r.resolution_name, '. - 'st.status_name '. + 'st.status_name, '. + 'r.resolution_name '. 'from '. TBL_BUG.' b, '. TBL_AUTH_USER.' owner, '. TBL_AUTH_USER.' reporter, '. + TBL_BOOKMARK.' bookmark, '. TBL_RESOLUTION.' r, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. - TBL_SITE.' site '. + TBL_SITE.' site, '. + TBL_PRIORITY.' prio '. 'where '. 'b.resolution_id = r.resolution_id(+) '. 'and b.assigned_to = owner.user_id(+) '. 'and b.created_by = reporter.user_id(+) '. + 'and b.bug_id = bookmark.bug_id(+) '. + 'and b.bug_id = %s '. + 'and b.project_id not in (%s) '. + 'and b.site_id = site.site_id '. 'and b.severity_id = sv.severity_id '. 'and b.status_id = st.status_id '. - 'and b.site_id = site.site_id '. - 'and bug_id = %s '. - 'and b.project_id not in (%s)', + 'and b.priority = prio.priority_id', 'functions-bug-cc' => 'select '. 'b.user_id, '. @@ -347,6 +397,18 @@ 'p.project_name '. 'order by '. 'project_name', + 'include-template-bookmark' => + "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, ". + TBL_BOOKMARK." w ". + "where ". + "b.status_id = s.status_id (+) ". + "AND w.user_id=%s ". + "AND w.bug_id = b.bug_id", 'include-template-owner' => "SELECT ". "sum(decode( s.status_id in (".OPEN_BUG_STATUSES.") , 1, 1, 0 )), ". @@ -392,48 +454,62 @@ '%s '. 'from '. TBL_BUG.' b, '. - TBL_AUTH_USER.' lastmodifier, '. TBL_AUTH_USER.' owner, '. TBL_AUTH_USER.' reporter, '. + TBL_AUTH_USER.' lastmodifier, '. + TBL_COMMENT.' comment, '. + TBL_ATTACHMENT.' attachment, '. + TBL_BUG_VOTE.' vote, '. + TBL_BOOKMARK.' bookmark, '. + TBL_RESOLUTION.' resolution, '. + TBL_DATABASE.' database, '. + TBL_VERSION.' version2, '. + TBL_VERSION.' version3, '. TBL_SEVERITY.' severity, '. TBL_STATUS.' status, '. TBL_OS.' os, '. + TBL_SITE.' site, '. TBL_VERSION.' version, '. - TBL_VERSION.' version2, '. - TBL_VERSION.' version3, '. TBL_COMPONENT.' component, '. TBL_PROJECT.' project, '. - TBL_RESOLUTION.' resolution, '. - TBL_SITE.' site, '. - TBL_DATABASE.' '. + TBL_PRIORITY.' priority '. 'where '. 'b.assigned_to = owner.user_id(+) '. 'and b.created_by = reporter.user_id(+) '. 'and b.last_modified_by = lastmodifier.user_id(+) '. + 'and b.bug_id = comment.bug_id(+) '. + 'and b.bug_id = attachment.bug_id(+) '. + 'and b.bug_id = vote.bug_id(+) '. + 'and b.bug_id = bookmark.bug_id(+) '. 'and b.resolution_id = resolution.resolution_id(+) '. + 'and b.database_id = database.database_id(+) '. + 'and b.to_be_closed_in_version_id = version2.version_id(+) '. + 'and b.closed_in_version_id = version3.version_id(+) '. 'and b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. - 'and b.version_id = version.version_id '. - 'and b.to_be_closed_in_version_id = version2.version_id(+) '. - 'and b.closed_in_version_id = version3.version_id(+) '. - 'and b.database_id = '.TBL_DATABASE.'.database_id(+) '. 'and b.site_id = site.site_id '. + 'and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. 'and b.project_id = project.project_id %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. - 'bug_id asc', + 'b.bug_id asc', 'query-list-bugs-count' => 'select '. 'count(*) '. 'from '. TBL_BUG.' b, '. TBL_AUTH_USER.' owner, '. - TBL_AUTH_USER.' reporter '. + TBL_AUTH_USER.' reporter, '. + TBL_BOOKMARK.' bookmark '. 'where '. 'b.assigned_to = owner.user_id(+) '. - 'and b.created_by = reporter.user_id(+) ', + 'and b.created_by = reporter.user_id(+) '. + 'and b.bug_id = bookmark.bug_id(+) ', 'query-list-bugs-count-join' => 'and ', 'report-resbyeng-1' => Index: pgsql.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pgsql.php 23 Aug 2005 21:09:42 -0000 1.27 +++ pgsql.php 23 Aug 2005 21:12:39 -0000 1.28 @@ -9,6 +9,7 @@ 'c.component_name, '. 'c.created_date, '. 'c.active, '. + 'c.sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_COMPONENT.' c '. @@ -40,8 +41,7 @@ 'ag.group_id, '. 'group_name, '. 'locked, '. - 'count(ug.group_id) as count, '. - 'assignable '. + 'count(ug.group_id) as count '. 'from '. TBL_AUTH_GROUP.' ag '. 'left join '.TBL_USER_GROUP.' ug using (group_id) '. @@ -49,8 +49,7 @@ 'group by '. 'ag.group_id, '. 'group_name, '. - 'locked, '. - 'assignable '. + 'locked '. 'order by '. '%s %s', 'admin-list-oses' => @@ -70,6 +69,25 @@ 'sort_order '. 'order by '. '%s %s', + 'admin-list-priorities' => + 'select '. + 'p.priority_id, '. + 'priority_name, '. + 'priority_desc, '. + 'priority_color, '. + 'sort_order, '. + 'count(bug_id) as bug_count '. + 'from '. + TBL_PRIORITY.' p '. + 'left join '.TBL_BUG.' b on b.priority = p.priority_id '. + 'group by '. + 'p.priority_id, '. + 'priority_name, '. + 'priority_desc, '. + 'priority_color, '. + 'sort_order '. + 'order by '. + '%s %s', 'admin-list-resolutions' => 'select '. 's.resolution_id, '. @@ -145,6 +163,7 @@ 'v.version_name, '. 'v.created_date, '. 'v.active, '. + 'v.sort_order, '. 'count(bug_id) as bug_count '. 'from '. TBL_VERSION.' v '. @@ -207,14 +226,21 @@ 'bh.created_date', 'bug-prev-next' => 'select '. - 'bug_id, '. + 'b.bug_id, '. 'reporter.login as reporter, '. - 'owner.login as owner '. + 'owner.login as owner, '. + 'count(distinct comment.comment_id) as comments, '. + 'count(distinct attachment.attachment_id) as attachments, '. + 'count(distinct vote.user_id) as votes '. 'from '. TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '. + 'left join '.TBL_COMMENT.' comment on b.bug_id = comment.bug_id '. + 'left join '.TBL_ATTACHMENT.' attachment on b.bug_id = attachment.bug_id '. + 'left join '.TBL_BUG_VOTE.' vote on b.bug_id = vote.bug_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '. 'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '. 'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '. @@ -222,12 +248,14 @@ TBL_SEVERITY.' severity, '. TBL_STATUS.' status, '. TBL_OS.' os, '. + TBL_PRIORITY.' priority, '. TBL_VERSION.' version, '. TBL_COMPONENT.' component, '. TBL_PROJECT.' project, '. TBL_SITE.' site '. 'where '. 'b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. 'and b.version_id = version.version_id '. @@ -235,10 +263,12 @@ 'and b.project_id = project.project_id '. 'and %s '. 'and b.site_id = site.site_id '. - 'and bug_id <> %s '. + 'and b.bug_id <> %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. - 'bug_id asc', + 'b.bug_id asc', 'bug-printable' => 'select '. 'b.*, '. @@ -248,6 +278,7 @@ 'component_name, '. 'version_name, '. 'severity_name, '. + 'priority_name, '. 'os_name, '. 'status_name, '. 'resolution_name '. @@ -255,17 +286,20 @@ TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. TBL_OS.' os, '. TBL_VERSION.' v, '. + TBL_PRIORITY.' priority, '. TBL_COMPONENT.' c, '. TBL_PROJECT.' p '. 'where '. - 'bug_id = %s '. + 'b.bug_id = %s '. 'and b.project_id not in (%s) '. 'and b.severity_id = sv.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.os_id = os.os_id '. 'and b.version_id = v.version_id '. 'and b.component_id = c.component_id '. @@ -282,16 +316,19 @@ TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' r on b.resolution_id = r.resolution_id, '. TBL_SEVERITY.' sv, '. TBL_STATUS.' st, '. - TBL_SITE.' site '. + TBL_SITE.' site, '. + TBL_PRIORITY.' prio '. 'where '. - 'bug_id = %s '. + 'b.bug_id = %s '. 'and b.project_id not in (%s) '. 'and b.site_id = site.site_id '. 'and b.severity_id = sv.severity_id '. - 'and b.status_id = st.status_id', + 'and b.status_id = st.status_id'. + 'and b.priority = prio.priority_id', 'functions-bug-cc' => 'select '. 'b.user_id, '. @@ -316,6 +353,17 @@ 'p.project_name '. 'order by '. 'project_name', + 'include-template-bookmark' => + "SELECT ". + "sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ), ". + "sum(CASE WHEN s.status_id not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ". + "from ". + TBL_BUG." b ". + "left join ".TBL_STATUS." s using(status_id), ". + TBL_BOOKMARK." w ". + "where ". + "w.user_id=%s ". + "AND w.bug_id = b.bug_id", 'include-template-owner' => "SELECT ". "sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ), ". @@ -362,6 +410,10 @@ 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. 'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '. + 'left join '.TBL_COMMENT.' comment on b.bug_id = comment.bug_id '. + 'left join '.TBL_ATTACHMENT.' attachment on b.bug_id = attachment.bug_id '. + 'left join '.TBL_BUG_VOTE.' vote on b.bug_id = vote.bug_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id '. 'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '. 'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '. 'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '. @@ -372,25 +424,30 @@ TBL_SITE.' site, '. TBL_VERSION.' version, '. TBL_COMPONENT.' component, '. - TBL_PROJECT.' project '. + TBL_PROJECT.' project, '. + TBL_PRIORITY.' priority '. 'where '. 'b.severity_id = severity.severity_id '. + 'and b.priority = priority.priority_id '. 'and b.status_id = status.status_id '. 'and b.os_id = os.os_id '. 'and b.site_id = site.site_id '. 'and b.version_id = version.version_id '. 'and b.component_id = component.component_id '. 'and b.project_id = project.project_id %s '. + 'group by '. + 'b.bug_id '. 'order by '. '%s %s, '. - 'bug_id asc', + 'b.bug_id asc', 'query-list-bugs-count' => 'select '. 'count(*) '. 'from '. TBL_BUG.' b '. 'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '. - 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id ', + 'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '. + 'left join '.TBL_BOOKMARK.' bookmark on b.bug_id = bookmark.bug_id ', 'query-list-bugs-count-join' => 'where ', 'report-resbyeng-1' => |
