aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-05-04 10:56:27 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-05-04 10:56:27 -0300
commitc61eebd64e579b196678e79dfbc3285de61d3923 (patch)
treefb99b4fcef3752a6830fabe5f6eefa274682e0aa /activerecord/lib
parent9aa63b2cbe03420dbec839079777b5b4ac02abab (diff)
downloadrails-c61eebd64e579b196678e79dfbc3285de61d3923.tar.gz
rails-c61eebd64e579b196678e79dfbc3285de61d3923.tar.bz2
rails-c61eebd64e579b196678e79dfbc3285de61d3923.zip
Simplify building options hash in rename column method for mysql
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 16e048423f..4184fad81c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -711,12 +711,13 @@ module ActiveRecord
end
def rename_column_sql(table_name, column_name, new_column_name)
- options = { name: new_column_name }
column = column_for(table_name, column_name)
-
- options[:default] = column.default
- options[:null] = column.null
- options[:auto_increment] = column.extra == "auto_increment"
+ options = {
+ name: new_column_name,
+ default: column.default,
+ null: column.null,
+ auto_increment: column.extra == "auto_increment"
+ }
current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
schema_creation.accept ChangeColumnDefinition.new column, current_type, options