Commit 2a3493e9 authored by Vitaly Lipatov's avatar Vitaly Lipatov

add quotas for groups table name

parent f6753fea
......@@ -1640,7 +1640,7 @@ sub _convert_groups_system_from_groupset {
$dbh->bz_drop_index('groups', 'groups_name_idx');
my @primary_key = $dbh->primary_key(undef, undef, 'groups');
if (@primary_key) {
$dbh->do("ALTER TABLE groups DROP PRIMARY KEY");
$dbh->do("ALTER TABLE `groups` DROP PRIMARY KEY");
}
$dbh->bz_add_column('groups', 'id',
......@@ -2963,7 +2963,7 @@ sub _rederive_regex_groups {
my $sth = $dbh->prepare(
"SELECT profiles.userid, profiles.login_name, groups.id,
groups.userregexp, user_group_map.group_id
FROM (profiles CROSS JOIN groups)
FROM (profiles CROSS JOIN `groups`)
LEFT JOIN user_group_map
ON user_group_map.user_id = profiles.userid
AND user_group_map.group_id = groups.id
......
......@@ -666,7 +666,7 @@ sub groups_available {
$dbh->selectcol_arrayref(
"SELECT group_id, membercontrol
FROM group_control_map
INNER JOIN groups ON group_control_map.group_id = groups.id
INNER JOIN `groups` ON group_control_map.group_id = groups.id
WHERE isbuggroup = 1 AND isactive = 1 AND product_id = ?
AND (membercontrol = $shown OR membercontrol = $default)
AND " . Bugzilla->user->groups_in_sql(), {Columns => [1, 2]},
......@@ -681,7 +681,7 @@ sub groups_available {
$dbh->selectcol_arrayref(
"SELECT group_id, othercontrol
FROM group_control_map
INNER JOIN groups ON group_control_map.group_id = groups.id
INNER JOIN `groups` ON group_control_map.group_id = groups.id
WHERE isbuggroup = 1 AND isactive = 1 AND product_id = ?
AND (othercontrol = $shown OR othercontrol = $default)",
{Columns => [1, 2]}, $self->id
......@@ -718,7 +718,7 @@ sub groups_mandatory {
my $ids = Bugzilla->dbh->selectcol_arrayref(
"SELECT group_id
FROM group_control_map
INNER JOIN groups ON group_control_map.group_id = groups.id
INNER JOIN `groups` ON group_control_map.group_id = groups.id
WHERE product_id = ? AND isactive = 1
AND (membercontrol = $mandatory
OR (othercontrol = $mandatory
......@@ -754,7 +754,7 @@ sub groups_valid {
my $ids = Bugzilla->dbh->selectcol_arrayref(
"SELECT DISTINCT group_id
FROM group_control_map AS gcm
INNER JOIN groups ON gcm.group_id = groups.id
INNER JOIN `groups` ON gcm.group_id = groups.id
WHERE product_id = ? AND isbuggroup = 1
AND membercontrol != " . CONTROLMAPNA, undef, $self->id
);
......
......@@ -2957,7 +2957,7 @@ sub _multiselect_table {
}
elsif ($field eq 'bug_group') {
$args->{full_field} = 'groups.name';
return "bug_group_map INNER JOIN groups
return "bug_group_map INNER JOIN `groups`
ON bug_group_map.group_id = groups.id";
}
elsif ($field eq 'blocked' or $field eq 'dependson') {
......
......@@ -368,7 +368,7 @@ if ($action eq 'updategroupcontrols') {
FROM bugs
INNER JOIN bug_group_map
ON bug_group_map.bug_id = bugs.bug_id
INNER JOIN groups
INNER JOIN `groups`
ON bug_group_map.group_id = groups.id
WHERE groups.id IN (' . join(', ', @now_na) . ')
AND bugs.product_id = ? ' . $dbh->sql_group_by('groups.name'),
......@@ -390,7 +390,7 @@ if ($action eq 'updategroupcontrols') {
(SELECT bug_group_map.bug_id FROM bug_group_map
WHERE bug_group_map.group_id = groups.id))
AS count
FROM groups
FROM `groups`
WHERE groups.id IN (' . join(', ', @now_mandatory) . ')
ORDER BY groups.name', {'Slice' => {}}, $product->id
);
......
......@@ -127,7 +127,7 @@ if ($cgi->param('createmissinggroupcontrolmapentries')) {
FROM bugs
INNER JOIN bug_group_map AS bgm
ON bugs.bug_id = bgm.bug_id
INNER JOIN groups
INNER JOIN `groups`
ON bgm.group_id = groups.id
INNER JOIN products
ON bugs.product_id = products.id
......@@ -973,7 +973,7 @@ BugCheck(
"bugs
INNER JOIN group_control_map
ON bugs.product_id = group_control_map.product_id
INNER JOIN groups
INNER JOIN `groups`
ON group_control_map.group_id = groups.id
LEFT JOIN bug_group_map
ON bugs.bug_id = bug_group_map.bug_id
......
......@@ -400,7 +400,7 @@ sub DoPermissions {
}
$groups = $dbh->selectall_arrayref(
'SELECT DISTINCT id, name, description
FROM groups
FROM `groups`
ORDER BY name'
);
foreach my $group (@$groups) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment