aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 11:55:12 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 11:55:12 -0700
commit17077639c2805d2f40b579215c2e1fa7b9951e5c (patch)
treead6ceae8eb29012d016f059df5aaa4e63b934970 /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
parentb6e5971e53746a79abc92ce9acea85ca14fab0b3 (diff)
parent437961b558363df0f489fe976f89258c442dcb05 (diff)
downloadrails-17077639c2805d2f40b579215c2e1fa7b9951e5c.tar.gz
rails-17077639c2805d2f40b579215c2e1fa7b9951e5c.tar.bz2
rails-17077639c2805d2f40b579215c2e1fa7b9951e5c.zip
Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysql
respect auto_increment in rename_column for mysql
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 25b8aef617..6b319fed88 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -63,8 +63,8 @@ module ActiveRecord
end
end
- def new_column(field, default, type, null, collation) # :nodoc:
- Column.new(field, default, type, null, collation, strict_mode?)
+ def new_column(field, default, type, null, collation, extra = "") # :nodoc:
+ Column.new(field, default, type, null, collation, strict_mode?, extra)
end
def error_number(exception)