Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] [#26 state:resolved]

This commit is contained in:
David Heinemeier Hansson
2008-04-29 16:52:52 -05:00
parent 5514baf63d
commit 10ef65a3b0
2 changed files with 10 additions and 1 deletions

View File

@@ -1,5 +1,7 @@
*SVN*
* Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] [#26]
* Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [DHH]
* Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]). Love your database columns, don't LOWER them. [rick]

View File

@@ -297,7 +297,14 @@ module ActiveRecord
def add_column_options!(sql, options) #:nodoc:
sql << " DEFAULT #{quote(options[:default], options[:column])}" if options_include_default?(options)
sql << " NOT NULL" if options[:null] == false
# must explcitly check for :null to allow change_column to work on migrations
if options.has_key? :null
if options[:null] == false
sql << " NOT NULL"
else
sql << " NULL"
end
end
end
# SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.