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 dcca05bbacbc22a975c586ee39f18f358ed654ed..30f9dd4ead50c79328f6894ce403d271ed60fda4 100755 (executable)
--- 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 57fe78830d514a99cabf5caf6645e13652f460af..4ceda927a7619ce92c36250ee77e2f8295fb0bb7 100755 (executable)
--- 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 f5486f37b3d632c41ce433692f4a607128101808..73fdbf4874709fb95ea355feadb6e6c8f4cc21f0 100755 (executable)
--- 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 0efbc070b86ec0e601040e437d1c57049f58f4b9..381d28ed9fb99398f099af46aaa8d519e4ec1856 100755 (executable)
--- 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";