Bug 557495: PostgreSQL crashes when deleting a custom field of type BugID

r/a=mkanat

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 15f84e75f924e597c8cdb88bdada15f2bd605c86..31ace90e0d786570aab258bd7adf0357407b0e0d 100644 (file)
--- 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 != '---'";