summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-09-25 18:17:52 +0200
committerByron Jones <bjones@mozilla.com>2013-09-25 18:17:52 +0200
commit3d49752f959fd6c2b5e88eef8333b15705614f68 (patch)
tree6ce6213a7ed74b77a3c8f59463d7d907e9acac65 /Bugzilla
parentac5fe08d4f2390f54888a7a8806e829b68b27ec5 (diff)
downloadbugzilla-3d49752f959fd6c2b5e88eef8333b15705614f68.tar.gz
bugzilla-3d49752f959fd6c2b5e88eef8333b15705614f68.tar.xz
Bug 920060: Bug.search API doesn't return total results
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Search.pm13
-rw-r--r--Bugzilla/WebService/Bug.pm3
2 files changed, 15 insertions, 1 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index aff189c43..f51a12372 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -753,6 +753,9 @@ sub data {
# Restore the original 'fields' argument, just in case.
$self->{fields} = \@orig_fields unless $all_in_bugs_table;
+ # BMO if the caller only wants the count, that's all we need to return
+ return $bug_ids->[0]->[0] if $self->_params->{count_only};
+
# If there are no bugs found, or all fields are in the 'bugs' table,
# there is no need for another query.
if (!scalar @$bug_ids || $all_in_bugs_table) {
@@ -811,7 +814,15 @@ sub _sql {
? "\nORDER BY " . join(', ', $self->_sql_order_by) : '';
my $limit = $self->_sql_limit;
$limit = "\n$limit" if $limit;
-
+
+ # BMO allow fetching just the number of matching bugs
+ if ($self->_params->{count_only}) {
+ $select = 'COUNT(*) AS count';
+ $group_by = '';
+ $order_by = '';
+ $limit = '';
+ }
+
my $query = <<END;
SELECT $select
FROM $from
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 8461b3d97..a107da923 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -524,6 +524,9 @@ sub search {
my $search = new Bugzilla::Search(%options);
my ($data) = $search->data;
+ # BMO if the caller only wants the count, that's all we need to return
+ return $data if $params->{count_only};
+
if (!scalar @$data) {
return { bugs => [] };
}