1 files changed, 58 insertions, 49 deletions

diff --git a/scripts/fixgroupqueries.pl b/scripts/fixgroupqueries.pl
index 23d86268d..23fcfb9f0 100755
--- a/scripts/fixgroupqueries.pl
+++ b/scripts/fixgroupqueries.pl
@@ -42,61 +42,70 @@ USAGE
 }
 
 sub do_namedqueries($$) {
-    my ($old, $new) = @_;
-    $old = url_quote($old);
-    $new = url_quote($new);
-
-    my $dbh = Bugzilla->dbh;
-
-    my $replace_count = 0;
-    my $query = $dbh->selectall_arrayref("SELECT id, query FROM namedqueries");
-    if ($query) {
-        my $sth = $dbh->prepare("UPDATE namedqueries SET query = ?
-                                                     WHERE id = ?");
-
-        foreach my $row (@$query) {
-            my ($id, $query) = @$row;
-            if (($query =~ /field\d+-\d+-\d+=bug_group/) &&
-                ($query =~ /(?:^|&|;)value\d+-\d+-\d+=$old(?:;|&|$)/)) {
-                $query =~ s/((?:^|&|;)value\d+-\d+-\d+=)$old(;|&|$)/$1$new$2/;
-                $sth->execute($query, $id);
-                $replace_count++;
-            }
-        }
+  my ($old, $new) = @_;
+  $old = url_quote($old);
+  $new = url_quote($new);
+
+  my $dbh = Bugzilla->dbh;
+
+  my $replace_count = 0;
+  my $query = $dbh->selectall_arrayref("SELECT id, query FROM namedqueries");
+  if ($query) {
+    my $sth = $dbh->prepare(
+      "UPDATE namedqueries SET query = ?
+                                                     WHERE id = ?"
+    );
+
+    foreach my $row (@$query) {
+      my ($id, $query) = @$row;
+      if ( ($query =~ /field\d+-\d+-\d+=bug_group/)
+        && ($query =~ /(?:^|&|;)value\d+-\d+-\d+=$old(?:;|&|$)/))
+      {
+        $query =~ s/((?:^|&|;)value\d+-\d+-\d+=)$old(;|&|$)/$1$new$2/;
+        $sth->execute($query, $id);
+        $replace_count++;
+      }
     }
+  }
 
-    print "namedqueries: $replace_count replacements made.\n";
+  print "namedqueries: $replace_count replacements made.\n";
 }
 
 # series
 sub do_series($$) {
-    my ($old, $new) = @_;
-    $old = url_quote($old);
-    $new = url_quote($new);
-
-    my $dbh = Bugzilla->dbh;
-    #$dbh->bz_start_transaction();
-
-    my $replace_count = 0;
-    my $query = $dbh->selectall_arrayref("SELECT series_id, query
-                                          FROM series");
-    if ($query) {
-        my $sth = $dbh->prepare("UPDATE series SET query = ?
-                                               WHERE series_id = ?");
-        foreach my $row (@$query) {
-            my ($series_id, $query) = @$row;
-
-            if (($query =~ /field\d+-\d+-\d+=bug_group/) &&
-                ($query =~ /(?:^|&|;)value\d+-\d+-\d+=$old(?:;|&|$)/)) {
-                $query =~ s/((?:^|&|;)value\d+-\d+-\d+=)$old(;|&|$)/$1$new$2/;
-                $sth->execute($query, $series_id);
-                $replace_count++;
-            }
-        }
+  my ($old, $new) = @_;
+  $old = url_quote($old);
+  $new = url_quote($new);
+
+  my $dbh = Bugzilla->dbh;
+
+  #$dbh->bz_start_transaction();
+
+  my $replace_count = 0;
+  my $query         = $dbh->selectall_arrayref(
+    "SELECT series_id, query
+                                          FROM series"
+  );
+  if ($query) {
+    my $sth = $dbh->prepare(
+      "UPDATE series SET query = ?
+                                               WHERE series_id = ?"
+    );
+    foreach my $row (@$query) {
+      my ($series_id, $query) = @$row;
+
+      if ( ($query =~ /field\d+-\d+-\d+=bug_group/)
+        && ($query =~ /(?:^|&|;)value\d+-\d+-\d+=$old(?:;|&|$)/))
+      {
+        $query =~ s/((?:^|&|;)value\d+-\d+-\d+=)$old(;|&|$)/$1$new$2/;
+        $sth->execute($query, $series_id);
+        $replace_count++;
+      }
     }
+  }
 
-    #$dbh->bz_commit_transaction();
-    print "series:      $replace_count replacements made.\n";
+  #$dbh->bz_commit_transaction();
+  print "series:      $replace_count replacements made.\n";
 }
 
 #############################################################################
@@ -106,8 +115,8 @@ sub do_series($$) {
 Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
 
 if (scalar @ARGV < 2) {
-    usage();
-    exit();
+  usage();
+  exit();
 }
 
 my ($old, $new) = @ARGV;