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 2f85120a4db60726db654a35107436018ae53108..e7ffcdf6540eb5a84e3cae4d842847008a623b10 100644 (file)
--- 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);