From 4f023328eeab5dd137263a2488fb8ef307170f07 Mon Sep 17 00:00:00 2001
From: Edmund Yan <edmundhyan@gmail.com>
Date: Sun, 21 Aug 2011 02:11:29 +0200
Subject: Bug 679516: Call Bugzilla::Object->remove_from_db when deleting an
 object r/a=LpSolit

---
 Bugzilla/Field.pm     | 2 +-
 Bugzilla/Milestone.pm | 2 +-
 Bugzilla/Product.pm   | 2 +-
 Bugzilla/Status.pm    | 7 -------
 4 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index aa3551182..6b42cc4af 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -948,7 +948,7 @@ sub remove_from_db {
     }
 
     # Once we reach here, we should be OK to delete.
-    $dbh->do('DELETE FROM fielddefs WHERE id = ?', undef, $self->id);
+    $self->SUPER::remove_from_db();
 
     my $type = $self->type;
 
diff --git a/Bugzilla/Milestone.pm b/Bugzilla/Milestone.pm
index 92bc2192a..61e2a12bb 100644
--- a/Bugzilla/Milestone.pm
+++ b/Bugzilla/Milestone.pm
@@ -158,7 +158,7 @@ sub remove_from_db {
         }
     }
 
-    $dbh->do('DELETE FROM milestones WHERE id = ?', undef, $self->id);
+    $self->SUPER::remove_from_db();
 }
 
 ################################
diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm
index 85524ac47..64a146be9 100644
--- a/Bugzilla/Product.pm
+++ b/Bugzilla/Product.pm
@@ -317,7 +317,7 @@ sub remove_from_db {
         }
     }
 
-    $dbh->do("DELETE FROM products WHERE id = ?", undef, $self->id);
+    $self->SUPER::remove_from_db();
 
     $dbh->bz_commit_transaction();
 
diff --git a/Bugzilla/Status.pm b/Bugzilla/Status.pm
index ffef600de..f3d6d808c 100644
--- a/Bugzilla/Status.pm
+++ b/Bugzilla/Status.pm
@@ -76,14 +76,7 @@ sub create {
 
 sub remove_from_db {
     my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $id = $self->id;
-    $dbh->bz_start_transaction();
     $self->SUPER::remove_from_db();
-    $dbh->do('DELETE FROM status_workflow
-               WHERE old_status = ? OR new_status = ?',
-              undef, $id, $id);
-    $dbh->bz_commit_transaction();
     delete Bugzilla->request_cache->{status_bug_state_open};
 }
 
-- 
cgit v1.2.3-24-g4f1b