diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2016-01-03 05:41:53 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2016-01-04 14:46:59 +0900 |
commit | 2f373dd916cfab568d489e2103ba71284bc3e695 (patch) | |
tree | 0bbb0ab9f62b7a2927395e5d8e04caa080eb95a2 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
parent | 3d590add45b7ff1de972d99b076cb504d5208935 (diff) | |
download | rails-2f373dd916cfab568d489e2103ba71284bc3e695.tar.gz rails-2f373dd916cfab568d489e2103ba71284bc3e695.tar.bz2 rails-2f373dd916cfab568d489e2103ba71284bc3e695.zip |
Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQL
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 6 |
1 files changed, 3 insertions, 3 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 f5b5482efb..b55995bc8d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -40,11 +40,11 @@ module ActiveRecord end def blob_or_text_column? - sql_type =~ /blob/i || type == :text + /\A(?:tiny|medium|long)?blob\b/ === sql_type || type == :text end def unsigned? - /unsigned/ === sql_type + /\bunsigned\z/ === sql_type end def case_sensitive? @@ -835,7 +835,7 @@ module ActiveRecord def register_integer_type(mapping, key, options) # :nodoc: mapping.register_type(key) do |sql_type| - if /unsigned/i =~ sql_type + if /\bunsigned\z/ === sql_type Type::UnsignedInteger.new(options) else Type::Integer.new(options) |