diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-15 02:22:53 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-15 02:22:53 +0000 |
commit | 6019c268562d3d1e62c3ad649e81a1803f3e0732 (patch) | |
tree | 4fbad66ece81acb10c8d7a705339565c3ae6c459 /activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | |
parent | a491f928608f763cf4fa6067f7cf9529197afcae (diff) | |
download | rails-6019c268562d3d1e62c3ad649e81a1803f3e0732.tar.gz rails-6019c268562d3d1e62c3ad649e81a1803f3e0732.tar.bz2 rails-6019c268562d3d1e62c3ad649e81a1803f3e0732.zip |
change_column accepts :default => nil. Closes #6956.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5937 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 8891c10c7c..edb3042afc 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -273,10 +273,10 @@ module ActiveRecord column_type_sql << "(#{limit})" if limit column_type_sql end - end - + end + def add_column_options!(sql, options) #:nodoc: - sql << " DEFAULT #{quote(options[:default], options[:column])}" unless options[:default].nil? + sql << " DEFAULT #{quote(options[:default], options[:column])}" if options_include_default?(options) sql << " NOT NULL" if options[:null] == false end @@ -293,6 +293,11 @@ module ActiveRecord def add_order_by_for_association_limiting!(sql, options) sql << "ORDER BY #{options[:order]}" end + + protected + def options_include_default?(options) + options.include?(:default) && !(options[:null] == false && options[:default].nil?) + end end end end |