diff options
| author | masarakki <masaki@hisme.net> | 2013-04-01 16:48:26 +0900 |
|---|---|---|
| committer | masarakki <masaki@hisme.net> | 2013-04-01 17:09:20 +0900 |
| commit | eab657b267ae898e8cad36385574f91ef838610e (patch) | |
| tree | 6e0c2a4050071e04cbd0de9adf8fcf7d34338e29 /activerecord/lib | |
| parent | 0a16cf19c2e2a2ba5cdb6ca849b60751f6cb52ed (diff) | |
| download | rails-eab657b267ae898e8cad36385574f91ef838610e.tar.gz rails-eab657b267ae898e8cad36385574f91ef838610e.tar.bz2 rails-eab657b267ae898e8cad36385574f91ef838610e.zip | |
fix detect column type of enum
enum includes text or blob or ... hooked by wrong regex
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 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 b0b160f9b4..94d9efe521 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -82,6 +82,8 @@ module ActiveRecord def extract_limit(sql_type) case sql_type + when /^enum\((.+)\)/i + $1.split(',').map{|enum| enum.strip.length - 2}.max when /blob|text/i case sql_type when /tiny/i @@ -98,8 +100,6 @@ 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 |