From e60d388f70533d0efd0632f39aadddcb2590a171 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 15 Oct 2010 02:05:52 +0200
Subject: Bug 451735 part2: fix bz_drop_index() so that it first drops related
 FKs before deleting the index itself r/a=mkanat

---
 Bugzilla/DB.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Bugzilla/DB.pm')

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 27644fba5..0290623d2 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -933,10 +933,16 @@ sub bz_drop_index {
     my $index_exists = $self->bz_index_info($table, $name);
 
     if ($index_exists) {
+        # We cannot delete an index used by a FK.
+        foreach my $column (@{$index_exists->{FIELDS}}) {
+            $self->bz_drop_related_fks($table, $column);
+        }
         $self->bz_drop_index_raw($table, $name);
         $self->_bz_real_schema->delete_index($table, $name);
         $self->_bz_store_real_schema;        
     }
+
+    return $index_exists ? 1 : 0;
 }
 
 # bz_drop_index_raw($table, $name, $silent)
-- 
cgit v1.2.3-24-g4f1b