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

---
 Bugzilla/Field.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Bugzilla/Field.pm')

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 31ace90e0..2513a19ae 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -822,17 +822,13 @@ sub remove_from_db {
     }
     else {
         $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL";
-        if ($self->type != FIELD_TYPE_BUG_ID) {
+        if ($self->type != FIELD_TYPE_BUG_ID && $self->type != FIELD_TYPE_DATETIME) {
             $bugs_query .= " AND $name != ''";
         }
         # Ignore the default single select value
         if ($self->type == FIELD_TYPE_SINGLE_SELECT) {
             $bugs_query .= " AND $name != '---'";
         }
-        # Ignore blank dates.
-        if ($self->type == FIELD_TYPE_DATETIME) {
-            $bugs_query .= " AND $name != '00-00-00 00:00:00'";
-        }
     }
 
     my $has_bugs = $dbh->selectrow_array($bugs_query);
-- 
cgit v1.2.3-24-g4f1b