summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search.pm84
-rw-r--r--Bugzilla/Search/Clause.pm36
-rw-r--r--Bugzilla/Search/Quicksearch.pm4
3 files changed, 31 insertions, 93 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 4bb74f983..f0cb26357 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -300,9 +300,7 @@ use constant OPERATOR_FIELD_OVERRIDE => {
},
dependson => MULTI_SELECT_OVERRIDE,
keywords => MULTI_SELECT_OVERRIDE,
- 'flagtypes.name' => {
- _non_changed => \&_flagtypes_nonchanged,
- },
+ 'flagtypes.name' => MULTI_SELECT_OVERRIDE,
longdesc => {
changedby => \&_long_desc_changedby,
changedbefore => \&_long_desc_changedbefore_after,
@@ -778,16 +776,8 @@ sub _sql {
my ($self) = @_;
return $self->{sql} if $self->{sql};
my $dbh = Bugzilla->dbh;
-
+
my ($joins, $clause) = $self->_charts_to_conditions();
-
- if (!$clause->as_string
- && !Bugzilla->params->{'search_allow_no_criteria'}
- && !$self->{allow_unlimited})
- {
- ThrowUserError('buglist_parameters_required');
- }
-
my $select = join(', ', $self->_sql_select);
my $from = $self->_sql_from($joins);
my $where = $self->_sql_where($clause);
@@ -1289,7 +1279,14 @@ sub _sql_where {
# SQL a bit more readable for debugging.
my $where = join("\n AND ", $self->_standard_where);
my $clause_sql = $main_clause->as_string;
- $where .= "\n AND " . $clause_sql if $clause_sql;
+ if ($clause_sql) {
+ $where .= "\n AND " . $clause_sql;
+ }
+ elsif (!Bugzilla->params->{'search_allow_no_criteria'}
+ && !$self->{allow_unlimited})
+ {
+ ThrowUserError('buglist_parameters_required');
+ }
return $where;
}
@@ -2482,9 +2479,9 @@ sub _content_matches {
my ($chart_id, $joins, $fields, $operator, $value) =
@$args{qw(chart_id joins fields operator value)};
my $dbh = Bugzilla->dbh;
-
+
# "content" is an alias for columns containing text for which we
- # can search a full-text index and retrieve results by relevance,
+ # can search a full-text index and retrieve results by relevance,
# currently just bug comments (and summaries to some degree).
# There's only one way to search a full-text index, so we only
# accept the "matches" operator, which is specific to full-text
@@ -2732,63 +2729,6 @@ sub _multiselect_multiple {
}
}
-sub _flagtypes_nonchanged {
- my ($self, $args) = @_;
- my ($chart_id, $operator, $value, $joins, $bugs_table) =
- @$args{qw(chart_id operator value joins bugs_table)};
- my $dbh = Bugzilla->dbh;
- my $join;
-
- # join to the attachments table
- my $attach_table = "attachments_$chart_id";
- $join = {
- table => 'attachments',
- as => $attach_table,
- from => "$bugs_table.bug_id",
- to => "bug_id",
- extra => [ ($self->_user->is_insider ? '' : "$attach_table.isprivate = 0") ],
- };
- push(@$joins, $join);
-
- # join to the flags table
- my $flags_table = "flags_$chart_id";
- $join = {
- table => 'flags',
- as => $flags_table,
- from => "$bugs_table.bug_id",
- to => "bug_id",
- extra => [ "($flags_table.attach_id = $attach_table.attach_id " .
- " OR $flags_table.attach_id IS NULL)" ],
- };
- push(@$joins, $join);
-
- # join to the flagtypes table
- my $flagtypes_table = "flagtypes_$chart_id";
- $join = {
- table => 'flagtypes',
- as => $flagtypes_table,
- from => "$flags_table.type_id",
- to => "id",
- };
- push(@$joins, $join);
-
- # join to the profiles table for the requestee
- my $flag_profile_table = "flag_profiles_$chart_id";
- $join = {
- table => 'profiles',
- as => $flag_profile_table,
- from => "$flags_table.requestee_id",
- to => "userid",
- };
- push(@$joins, $join);
-
- $args->{full_field} = $dbh->sql_string_concat("$flagtypes_table.name",
- "$flags_table.status",
- "COALESCE($flag_profile_table.login_name, '')");
-
- $self->_do_operator_function($args);
-}
-
sub _multiselect_nonchanged {
my ($self, $args) = @_;
my ($chart_id, $joins, $field, $operator) =
diff --git a/Bugzilla/Search/Clause.pm b/Bugzilla/Search/Clause.pm
index 89210babb..38f6f30be 100644
--- a/Bugzilla/Search/Clause.pm
+++ b/Bugzilla/Search/Clause.pm
@@ -98,29 +98,25 @@ sub walk_conditions {
sub as_string {
my ($self) = @_;
- if (!$self->{sql}) {
- my @strings;
- foreach my $child (@{ $self->children }) {
- next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
- next if $child->isa('Bugzilla::Search::Condition')
- && !$child->translated;
+ my @strings;
+ foreach my $child (@{ $self->children }) {
+ next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
+ next if $child->isa('Bugzilla::Search::Condition')
+ && !$child->translated;
- my $string = $child->as_string;
- next unless $string;
- if ($self->joiner eq 'AND') {
- $string = "( $string )" if $string =~ /OR/;
- }
- else {
- $string = "( $string )" if $string =~ /AND/;
- }
- push(@strings, $string);
+ my $string = $child->as_string;
+ if ($self->joiner eq 'AND') {
+ $string = "( $string )" if $string =~ /OR/;
}
-
- my $sql = join(' ' . $self->joiner . ' ', @strings);
- $sql = "NOT( $sql )" if $sql && $self->negate;
- $self->{sql} = $sql;
+ else {
+ $string = "( $string )" if $string =~ /AND/;
+ }
+ push(@strings, $string);
}
- return $self->{sql};
+
+ my $sql = join(' ' . $self->joiner . ' ', @strings);
+ $sql = "NOT( $sql )" if $sql && $self->negate;
+ return $sql;
}
# Search.pm converts URL parameters to Clause objects. This helps do the
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 92aaf7fb0..215cc842e 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -381,8 +381,10 @@ sub _handle_field_names {
my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
# Flag and requestee shortcut
- if ($or_operand =~ /^(?:flag:)?([^\?]+\?[^\?]*)$/) {
+ if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
addChart('flagtypes.name', 'substring', $1, $negate);
+ $chart++; $and = $or = 0; # Next chart for boolean AND
+ addChart('requestees.login_name', 'substring', $2, $negate);
return 1;
}