From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 7 Apr 2010 01:01:41 +0000 (+0200)
Subject: Bug 557686: PostgreSQL crashes when deleting a custom field of type Date/Time
X-Git-Tag: bugzilla-3.6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47636c468d67ade17789d8946ea217d0fc70ab2b;p=thirdparty%2Fbugzilla.git

Bug 557686: PostgreSQL crashes when deleting a custom field of type Date/Time
r=mkanat a=LpSolit
---

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 2f85120a4d..e7ffcdf654 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -722,17 +722,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);