change_column accepts :default => nil. Closes #6956.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5937 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb b/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
index cd48978f4e..a6df79ad0d 100644
--- a/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb
@@ -795,12 +795,12 @@ module ActiveRecord
 
       def add_column_options!(sql, options) #:nodoc:
         default_value = quote(options[:default], options[:column])
-        if options[:default]
+        if options_include_default?(options)
           if options[:type] == :boolean
             default_value = options[:default] == 0 ? quoted_false : quoted_true
           end
+          sql << " DEFAULT #{default_value}"
         end
-        sql << " DEFAULT #{default_value}" unless options[:default].nil?
         sql << " NOT NULL" if options[:null] == false
       end
 
@@ -828,17 +828,15 @@ module ActiveRecord
         execute(change_column_sql)
         change_column_sql = %( ALTER TABLE "#{table_name}" ALTER COLUMN "#{column_name}" )
 
-        default_value = quote(options[:default], options[:column])
-        if options[:default]
+        if options_include_default?(options)
+          default_value = quote(options[:default], options[:column])
           if type == :boolean
             default_value = options[:default] == 0 ? quoted_false : quoted_true
           end
-        end
-
-        if default_value != "NULL"
           change_column_sql << " SET DEFAULT #{default_value}"
-          execute(change_column_sql)
         end
+
+        execute(change_column_sql)
         
 #         change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"
 #         add_column_options!(change_column_sql, options)