vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 70605 - Add aliases to GROUP_CONCAT fields in search, as they break mysqldumping views 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1436 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2011-10-21 12:16:58 +00:00
parent 1efcc96bf9
commit b101d1e9d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bugzilla/Search.pm
View File

@ -483,13 +483,13 @@ sub STATIC_COLUMNS
'flagtypes.name' => {
name =>
"(SELECT ".$dbh->sql_group_concat($dbh->sql_string_concat('col_ft.name', 'col_f.status'), "', '").
" FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
" `flagtypes` FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
" WHERE col_f.bug_id=bugs.bug_id)",
},
flags => {
name =>
"(SELECT ".$dbh->sql_group_concat($dbh->sql_string_concat('col_ft.name', 'col_f.status'), "', '").
" FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
" `flags` FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
" WHERE col_f.bug_id=bugs.bug_id AND (col_ft.is_requesteeble=0 OR col_ft.is_requestable=0))",
title => "Flags",
},
@ -501,7 +501,7 @@ sub STATIC_COLUMNS
'CASE WHEN col_p.login_name IS NULL THEN \'\' ELSE '.
$dbh->sql_string_concat("' '", 'col_p.login_name').' END'
), "', '"
)." FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
)." `requests` FROM flags col_f JOIN flagtypes col_ft ON col_f.type_id=col_ft.id".
" INNER JOIN profiles col_p ON col_f.requestee_id=col_p.userid".
" WHERE col_f.bug_id=bugs.bug_id AND col_ft.is_requesteeble=1 AND col_ft.is_requestable=1)",
title => "Requests",
@ -510,14 +510,14 @@ sub STATIC_COLUMNS
name => "(SELECT ".$dbh->sql_group_concat((Bugzilla->user->id
? 'profiles.login_name'
: $dbh->sql_string_until('profiles.login_name', $dbh->quote('@'))), "','").
" FROM cc, profiles WHERE cc.bug_id=bugs.bug_id AND cc.who=profiles.userid)",
" `cc` FROM cc, profiles WHERE cc.bug_id=bugs.bug_id AND cc.who=profiles.userid)",
},
dependson => {
name => "(SELECT ".$dbh->sql_group_concat('bugblockers.dependson', "','")." FROM dependencies bugblockers WHERE bugblockers.blocked=bugs.bug_id)",
name => "(SELECT ".$dbh->sql_group_concat('bugblockers.dependson', "','")." `dependson` FROM dependencies bugblockers WHERE bugblockers.blocked=bugs.bug_id)",
title => "Bug dependencies",
},
blocked => {
name => "(SELECT ".$dbh->sql_group_concat('bugblocked.blocked', "','")." FROM dependencies bugblocked WHERE bugblocked.dependson=bugs.bug_id)",
name => "(SELECT ".$dbh->sql_group_concat('bugblocked.blocked', "','")." `blocked` FROM dependencies bugblocked WHERE bugblocked.dependson=bugs.bug_id)",
title => "Bugs blocked",
},
deadline => {