Bug 577800: Finish the cleanup of Search.pm's "init" function by removing

buglist.cgi

@@ -851,7 +851,7 @@ my @orderstrings = split(/,\s*/, $order);
 my $search = new Bugzilla::Search('fields' => \@selectcolumns, 
                                   'params' => $params,
                                   'order' => \@orderstrings);
-my $query = $search->getSQL();
+my $query = $search->sql;
 $vars->{'search_description'} = $search->search_description;
 
 if (defined $cgi->param('limit')) {

collectstats.pl

@@ -512,7 +512,7 @@ sub CollectSeriesData {
             my $search = new Bugzilla::Search('params' => $cgi,
                                               'fields' => ["bug_id"],
                                               'user'   => $user);
-            my $sql = $search->getSQL();
+            my $sql = $search->sql;
             $data = $shadow_dbh->selectall_arrayref($sql);
         };
 

report.cgi

@@ -128,7 +128,7 @@ my @axis_fields = ($row_field || EMPTY_COLUMN,
 my $params = new Bugzilla::CGI($cgi);
 my $search = new Bugzilla::Search('fields' => \@axis_fields, 
                                   'params' => $params);
-my $query = $search->getSQL();
+my $query = $search->sql;
 
 $::SIG{TERM} = 'DEFAULT';
 $::SIG{PIPE} = 'DEFAULT';

whine.pl

@@ -449,7 +449,7 @@ sub run_queries {
             'params' => $searchparams,
             'user'   => $args->{'recipient'}, # the search runs as the recipient
         );
-        my $sqlquery = $search->getSQL();
+        my $sqlquery = $search->sql;
         $sth = $dbh->prepare($sqlquery);
         $sth->execute;
 

xt/lib/Bugzilla/Test/Search/FieldTest.pm

@@ -497,20 +497,17 @@ sub do_tests {
 
     my $search_broken = $self->search_known_broken;
     
-    my $search;
+    my $search = $self->_test_search_object_creation();
+    
+    my $sql;
     TODO: {
         local $TODO = $search_broken if $search_broken;
-        $search = $self->_test_search_object_creation();
+        lives_ok { $sql = $search->sql } "$name: generate SQL";
     }
     
-    my ($results, $sql);
+    my $results;
     SKIP: {
-        skip "Can't run SQL without Search object", 2 if !$search;
-        lives_ok { $sql = $search->getSQL() } "$name: get SQL";
-    
-        # This prevents warnings from DBD::mysql if we pass undef $sql,
-        # which happens if "new Bugzilla::Search" fails.
-        $sql ||= '';
+        skip "Can't run SQL without any SQL", 1 if !defined $sql;
         $results = $self->_test_sql($sql);
     }