aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorLuke Steensen <luke.steensen@gmail.com>2014-03-30 12:34:01 -0500
committerLuke Steensen <luke.steensen@gmail.com>2014-03-30 12:34:01 -0500
commit5098bca97d22fd5318eac012ecfbbd5c34c3231d (patch)
treedd953a056db65f70e0008c5bcc6e0b537d6fc8ba /activerecord
parent78e4862f6f7079c10af44c269bf98046a41bc8cf (diff)
downloadrails-5098bca97d22fd5318eac012ecfbbd5c34c3231d.tar.gz
rails-5098bca97d22fd5318eac012ecfbbd5c34c3231d.tar.bz2
rails-5098bca97d22fd5318eac012ecfbbd5c34c3231d.zip
fix mysql builds
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 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 e4c6502bb7..20eea208ec 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -30,7 +30,7 @@ module ActiveRecord
options = o.options
sql_type = type_to_sql(o.type, options[:limit], options[:precision], options[:scale])
change_column_sql = "CHANGE #{quote_column_name(column.name)} #{quote_column_name(options[:name])} #{sql_type}"
- add_column_options!(change_column_sql, options)
+ add_column_options!(change_column_sql, options.merge(column: column))
add_column_position!(change_column_sql, options)
end