diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-27 11:20:23 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-27 11:20:23 -0700 |
| commit | 692b64e3ac9191abf03578e803f39905d90437ed (patch) | |
| tree | 3b0f975d4f05592f476fda9e6a2751acd22a4f1c /activerecord/lib | |
| parent | 2076efed1ca4b5df3a7101c9a478d6149bb53297 (diff) | |
| parent | f49800071f8cd26eed8bfb5463d015fa542437e1 (diff) | |
| download | rails-692b64e3ac9191abf03578e803f39905d90437ed.tar.gz rails-692b64e3ac9191abf03578e803f39905d90437ed.tar.bz2 rails-692b64e3ac9191abf03578e803f39905d90437ed.zip | |
Merge pull request #6878 from masarakki/master
fix bug in limit of enum columns of mysql
Closes #6432
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 2 insertions, 0 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 921278d145..df4a9d5afc 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -72,6 +72,8 @@ module ActiveRecord when /^mediumint/i; 3 when /^smallint/i; 2 when /^tinyint/i; 1 + when /^enum\((.+)\)/i + $1.split(',').map{|enum| enum.strip.length - 2}.max else super end |