From: jake%acutex.net <>
Date: Sat, 16 Jun 2001 21:51:15 +0000 (+0000)
Subject: Fix for bug 71396 - $::db->do isn't needed anymore
X-Git-Tag: bugzilla-2.14~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac03b19a3eeda57e38dd90bbb8333f77039c944f;p=thirdparty%2Fbugzilla.git

Fix for bug 71396 - $::db->do isn't needed anymore
Patch by Christian Reis <kiko@async.com.br>
r= jake@acutex.net
---

diff --git a/editcomponents.cgi b/editcomponents.cgi
index dcca05bbac..30f9dd4ead 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -608,15 +608,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/editmilestones.cgi b/editmilestones.cgi
index 57fe78830d..4ceda927a7 100755
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -425,15 +425,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/editproducts.cgi b/editproducts.cgi
index f5486f37b3..73fdbf4874 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -599,15 +599,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->do("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->do("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->do("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PopGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";
 
diff --git a/editversions.cgi b/editversions.cgi
index 0efbc070b8..381d28ed9f 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -436,15 +436,11 @@ if ($action eq 'delete') {
         while (MoreSQLData()) {
             my $bugid = FetchOneColumn();
 
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
+            PushGlobalSQLState();
+            SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
+            SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
+            PushGlobalSQLState();
         }
         print "Attachments, bug activity and dependencies deleted.<BR>\n";