From 6c604de4e442ea6fb716e6ca322a49773e795a74 Mon Sep 17 00:00:00 2001
From: "terry%mozilla.org" <>
Date: Sun, 23 Jan 2000 05:43:29 +0000
Subject: AACK!  checksetup.pl was stomping all over the new fielddefs table if
 it got run more than once.  This checkin fixes that, and also changes the
 DumpBugActivity() routine to give me enough information to hopefully repair
 the damaged mozilla.org database...

---
 checksetup.pl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'checksetup.pl')

diff --git a/checksetup.pl b/checksetup.pl
index 02e629805..6adbc42f4 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -851,9 +851,17 @@ sub AddFDef ($$$) {
     $name = $dbh->quote($name);
     $description = $dbh->quote($description);
 
+    my $sth = $dbh->prepare("SELECT fieldid FROM fielddefs " .
+                            "WHERE name = $name");
+    $sth->execute();
+    my ($fieldid) = ($sth->fetchrow_array());
+    if (!$fieldid) {
+        $fieldid = 'NULL';
+    }
+
     $dbh->do("REPLACE INTO fielddefs " .
-             "(name, description, mailhead, sortkey) VALUES " .
-             "($name, $description, $mailhead, $headernum)");
+             "(fieldid, name, description, mailhead, sortkey) VALUES " .
+             "($fieldid, $name, $description, $mailhead, $headernum)");
     $headernum++;
 }
 
@@ -876,6 +884,7 @@ AddFDef("cc", "CC", 0);
 AddFDef("dependson", "BugsThisDependsOn", 0);
 AddFDef("blocked", "OtherBugsDependingOnThis", 0);
 AddFDef("target_milestone", "Target Milestone", 0);
+AddFDef("stupidtest", "Stupidtest", 0);
     
     
 
-- 
cgit v1.2.3-24-g4f1b