From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 22 Jun 2010 05:31:02 +0000 (-0700)
Subject: The DB::Schema alter_column default fix also needed to be separately
X-Git-Tag: bugzilla-3.7.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6449a442d20bd8047767e48af850d8bdef3186b5;p=thirdparty%2Fbugzilla.git

The DB::Schema alter_column default fix also needed to be separately
applied to DB::Schema::Oracle, since it has a full override of
get_alter_column_ddl.

https://bugzilla.mozilla.org/show_bug.cgi?id=573441
---

diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm
index af0c11e9f5..6011cecfcf 100644
--- a/Bugzilla/DB/Schema/Oracle.pm
+++ b/Bugzilla/DB/Schema/Oracle.pm
@@ -214,6 +214,10 @@ sub get_alter_column_ddl {
 
     my $default = $new_def->{DEFAULT};
     my $default_old = $old_def->{DEFAULT};
+
+    if (defined $default) {
+        $default = $specific->{$default} if exists $specific->{$default};
+    }
     # This first condition prevents "uninitialized value" errors.
     if (!defined $default && !defined $default_old) {
         # Do Nothing
@@ -227,7 +231,6 @@ sub get_alter_column_ddl {
     elsif ( (defined $default && !defined $default_old) || 
             ($default ne $default_old) ) 
     {
-        $default = $specific->{$default} if exists $specific->{$default};
         push(@statements, "ALTER TABLE $table MODIFY $column "
                          . " DEFAULT $default");
     }
@@ -236,7 +239,7 @@ sub get_alter_column_ddl {
     if (!$old_def->{NOTNULL} && $new_def->{NOTNULL}) {
         my $setdefault;
         # Handle any fields that were NULL before, if we have a default,
-        $setdefault = $new_def->{DEFAULT} if exists $new_def->{DEFAULT};
+        $setdefault = $default if defined $default;
         # But if we have a set_nulls_to, that overrides the DEFAULT 
         # (although nobody would usually specify both a default and 
         # a set_nulls_to.)