Patch for bug 341374: fix checksetup failure when database exists with…

Patch for bug 341374: fix checksetup failure when database exists with non-Bugzilla table; patch by Olav Vitters <bugzilla-mozilla@bkor.dhs.org>, r=mkanat, a=justdave.

Patch for bug 341374: fix checksetup failure when database exists with…
1ae6c5f8 · vladd%bugzilla.org · 5eb383af · 1ae6c5f8
Commit 1ae6c5f8 authored Jun 18, 2006 by vladd%bugzilla.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Mysql.pm Bugzilla/DB/Mysql.pm +4 -4

No files found.
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -264,7 +264,7 @@ sub bz_setup_database {
    # http://bugs.mysql.com/bug.php?id=13535
    # This is a workaround, a dummy SELECT to reset the LAST_INSERT_ID.
    my @tables = $self->bz_table_list_real();
-    if (lsearch(\@tables, 'bugs') != -1
+    if (grep($_ eq 'bugs', @tables)
        && $self->bz_column_info_real("bugs", "bug_id"))
    {
        $self->do('SELECT 1 FROM bugs WHERE bug_id IS NULL');
@@ -285,9 +285,9 @@ sub bz_setup_database {
    # has existed at least since Bugzilla 2.8, and probably earlier.
    # For fixing the inconsistent naming of Schema indexes,
    # we also check for one of those inconsistently-named indexes.
-    if ( scalar(@tables) && 
+    if (grep($_ eq 'bugs', @tables)
-         ($self->bz_index_info_real('bugs', 'assigned_to') ||
+        && ($self->bz_index_info_real('bugs', 'assigned_to')
-          $self->bz_index_info_real('flags', 'flags_bidattid_idx')) )
+            || $self->bz_index_info_real('flags', 'flags_bidattid_idx')) )
    {
        # This is a check unrelated to the indexes, to see if people are