diff options
| author | bannzai <kingkong999yhirose@gmail.com> | 2019-01-07 23:36:31 +0900 |
|---|---|---|
| committer | bannzai <kingkong999yhirose@gmail.com> | 2019-01-08 14:56:46 +0900 |
| commit | 45cfe9f8b6a2aca1a7b88118654b7970874a08df (patch) | |
| tree | 6ebd8c91b8b9a64e5e7d6fab9e4810345928b455 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | 9cfcc067e626f0f1e220cc00a9f96622a936350d (diff) | |
| download | rails-45cfe9f8b6a2aca1a7b88118654b7970874a08df.tar.gz rails-45cfe9f8b6a2aca1a7b88118654b7970874a08df.tar.bz2 rails-45cfe9f8b6a2aca1a7b88118654b7970874a08df.zip | |
:recycle: Fix mysql type map for enum and set
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 | 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 10961ed9c8..cccd6e2210 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -579,13 +579,13 @@ module ActiveRecord m.alias_type %r(bit)i, "binary" m.register_type(%r(enum)i) do |sql_type| - limit = sql_type[/^enum\((.+)\)/i, 1] + limit = sql_type[/^enum\s*\((.+)\)/i, 1] .split(",").map { |enum| enum.strip.length - 2 }.max MysqlString.new(limit: limit) end m.register_type(%r(^set)i) do |sql_type| - limit = sql_type[/^set\((.+)\)/i, 1] + limit = sql_type[/^set\s*\((.+)\)/i, 1] .split(",").map { |set| set.strip.length - 1 }.sum - 1 MysqlString.new(limit: limit) end |