From c0771f4504ec5eff8de034a443c844d6effb8de0 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 7 Apr 2010 01:54:55 +0200
Subject: Bug 557495: PostgreSQL crashes when deleting a custom field of type
 BugID r/a=mkanat

---
 Bugzilla/Field.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Bugzilla/Field.pm')

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 15f84e75f..31ace90e0 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -821,8 +821,10 @@ sub remove_from_db {
         $bugs_query = "SELECT COUNT(*) FROM bug_$name";
     }
     else {
-        $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL
-                                AND $name != ''";
+        $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL";
+        if ($self->type != FIELD_TYPE_BUG_ID) {
+            $bugs_query .= " AND $name != ''";
+        }
         # Ignore the default single select value
         if ($self->type == FIELD_TYPE_SINGLE_SELECT) {
             $bugs_query .= " AND $name != '---'";
-- 
cgit v1.2.3-24-g4f1b