Merge branch 'master' into development

* master:
  Bumped version to 202500611.1
  Revert "Bug 1965553 - Uplift approval set in bugzilla without relman approval"
  Bug 1967336 - The error message generated by timeout of long running searches needs to also work with REST API in addition to the web UI
  Bug 1970652 - Move SQL comment to beginning of SQL statement so it is not truncated away in Googles Query Insights
  Bug 1965553 - Uplift approval set in bugzilla without relman approval
  Bumped version to 20250529.1
  Bug 1969307 - BMO ETL: Fix logic bug introduced by bug 1968044 that caused the looping of database rows to exit too early leaving out data

Author: dklawren

Bugzilla.pm

@@ -13,7 +13,7 @@ use warnings;
 
 use Bugzilla::Logging;
 
-our $VERSION = '20250513.1';
+our $VERSION = '20250611.1';
 
 use Bugzilla::Auth;
 use Bugzilla::Auth::Persist::Cookie;

Bugzilla/DB/Mysql.pm

@@ -77,7 +77,7 @@ sub on_dbi_connected {
     # causing bug 321645. TRADITIONAL sets these modes (among others) as
     # well, so it has to be stipped as well
     my $new_sql_mode = join(",",
-      grep { $_ !~ /^STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL$/ }
+      grep { $_ !~ /^STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL|ONLY_FULL_GROUP_BY$/ }
         split(/,/, $sql_mode));
 
     if ($sql_mode ne $new_sql_mode) {

Bugzilla/Search.pm

@@ -22,6 +22,7 @@ use Bugzilla::Error;
 use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::Keyword;
+use Bugzilla::Logging;
 use Bugzilla::Search::Clause;
 use Bugzilla::Search::ClauseGroup;
 use Bugzilla::Search::Condition qw(condition);
@@ -845,8 +846,8 @@ sub data {
   }
 
   # Do we just want bug IDs to pass to the 2nd query or all the data immediately?
-  #my $func = $all_in_bugs_table ? 'selectall_arrayref' : 'selectcol_arrayref';
-  #my $bug_ids = $dbh->$func($sql);
+  my $func = $all_in_bugs_table ? 'selectall_arrayref' : 'selectcol_arrayref';
+  my $bug_ids = $self->_sql_execute($sql, $func);
   my @extra_data = ({sql => $sql, time => tv_interval($start_time)});
 
   # Restore the original 'fields' argument, just in case.
@@ -883,9 +884,7 @@ sub data {
 
   $start_time = [gettimeofday()];
   $sql        = $search->_sql;
-  $sth        = $dbh->prepare($sql);
-  $dbh->bz_call_with_timeout($sth);
-  my $unsorted_data = $sth->fetchall_arrayref();
+  my $unsorted_data = $search->_sql_execute($sql, 'selectall_arrayref');
   push(@extra_data, {sql => $sql, time => tv_interval($start_time)});
 
   # Let's sort the data. We didn't do it in the query itself because
@@ -987,21 +986,48 @@ sub _sql {
   my $user_agent   = $cgi->user_agent || $cgi->script_name;
   my $query_string = $cgi->canonicalize_query();
   my $query        = <<END;
-SELECT $timeout_comment $select
-  FROM $from
- WHERE $where
-$group_by$order_by$limit
 /*
 user-id: $user_id
 remote-ip: $remote_ip
 user-agent: $user_agent
 query-string: $query_string
 */
+  SELECT $timeout_comment $select
+  FROM $from
+ WHERE $where
+$group_by$order_by$limit
 END
   $self->{sql} = $query;
   return $self->{sql};
 }
 
+sub _sql_execute {
+  my ($self, $sql, $func) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $results;
+  do {
+    local $SIG{__DIE__}  = undef;
+    local $SIG{__WARN__} = undef;
+
+    $results = eval { $dbh->$func($sql) };
+
+    # If the search query failed, handle Throw*Error correctly, or for all other
+    # failures log it and return an empty list of bugs.
+    if (my $search_err = $@) {
+      return if ref $search_err eq 'ARRAY' && $search_err->[0] eq "EXIT\n";
+      if (!ref $search_err
+        && $search_err =~ /maximum statement execution time exceeded/)
+      {
+        ThrowUserError('db_search_timeout');
+      }
+      ERROR(Dumper($self->_params) . ' ' . Dumper($search_err));
+    }
+  };
+
+  return $results;
+}
+
 sub search_description {
   my ($self, $params) = @_;
   my $desc = $self->{'search_description'} ||= [];

Bugzilla/WebService/Bug.pm

@@ -18,6 +18,7 @@ use Bugzilla::Comment::TagWeights;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Field;
+use Bugzilla::Logging;
 use Bugzilla::WebService::Constants;
 use Bugzilla::WebService::Util
   qw(extract_flags filter filter_wants validate translate);
@@ -35,6 +36,7 @@ use Bugzilla::Search::Quicksearch;
 
 use List::Util qw(max);
 use List::MoreUtils qw(uniq);
+use Mojo::Util qw(dumper);
 use Storable qw(dclone);
 use Types::Standard -all;
 use Type::Utils;
@@ -695,6 +697,8 @@ sub search {
   $options{params} = $match_params;
 
   my $search = new Bugzilla::Search(%options);
+
+  # Execute the query.
   my ($data) = $search->data;
 
   # BMO if the caller only wants the count, that's all we need to return

Bugzilla/WebService/Constants.pm

@@ -229,6 +229,7 @@ use constant WS_ERROR_CODE => {
 
   # Search errors are 1000-1100
   buglist_parameters_required => 1000,
+  db_search_timeout           => 1001,
 
   # Job queue errors 1400-1500
   jobqueue_status_error => 1400,

buglist.cgi

@@ -721,24 +721,10 @@ $::SIG{TERM} = 'DEFAULT';
 $::SIG{PIPE} = 'DEFAULT';
 
 # Execute the query.
-my ($data, $extra_data);
-do {
-  local $SIG{__DIE__}  = undef;
-  local $SIG{__WARN__} = undef;
-  ($data, $extra_data) = eval { $search->data };
-  # If the search query failed, handle Throw*Error correctly, or for all other
-  # failures log it and return an empty list of bugs.
-  if (my $search_err = $@) {
-    return if ref $search_err eq 'ARRAY' && $search_err->[0] eq "EXIT\n";
-    if (!ref $search_err && $search_err =~ /maximum statement execution time exceeded/) {
-      ThrowUserError('db_search_timeout');
-    }
-    use Data::Dumper;
-    ERROR 'buglist.cgi?' . $cgi->query_string . " " . Dumper($search_err);
-  }
-};
+my ($data, $extra_data) = $search->data;
 
 $vars->{'search_description'} = $search->search_description;
+
 if ( $cgi->param('debug')
   && Bugzilla->params->{debug_group}
   && $user->in_group(Bugzilla->params->{debug_group}))

template/en/default/global/user-error.html.tmpl

@@ -491,9 +491,9 @@
 
   [% ELSIF error == "db_search_timeout" %]
     [% title = "Request Timed Out" %]
-     Sorry, it’s taking too long to get the information you asked for. Please
-     try again in a moment. If it still doesn’t work, try using a simpler
-     search or narrowing down your request.
+    Sorry, it's taking too long to get the information you asked for. Please
+    try again in a moment. If it still doesn't work, try using a simpler
+    search or narrowing down your request.
 
   [% ELSIF error == "dependency_loop_multi" %]
     [% title = "Dependency Loop Detected" %]