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/firebird_adapter.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/firebird_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/firebird_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/firebird_adapter.rb b/activerecord/lib/active_record/connection_adapters/firebird_adapter.rb index 36222e4b0b..04f9f754a4 100644 --- a/activerecord/lib/active_record/connection_adapters/firebird_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/firebird_adapter.rb @@ -505,8 +505,8 @@ module ActiveRecord def change_column(table_name, column_name, type, options = {}) # :nodoc: change_column_type(table_name, column_name, type, options) - change_column_position(table_name, column_name, options[:position]) if options[:position] - change_column_default(table_name, column_name, options[:default]) if options.has_key?(:default) + change_column_position(table_name, column_name, options[:position]) if options.include?(:position) + change_column_default(table_name, column_name, options[:default]) if options_include_default?(options) end def change_column_default(table_name, column_name, default) # :nodoc: |