diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-01-08 15:43:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 15:43:52 +0900 |
| commit | a75dea08225285eec5fc199684cd1a51853d2845 (patch) | |
| tree | 152964272e16633d97aa45baa74c812c3865f093 | |
| parent | 29bb990f97816f3e0fb086ec9985983c51a56a96 (diff) | |
| parent | 45cfe9f8b6a2aca1a7b88118654b7970874a08df (diff) | |
| download | rails-a75dea08225285eec5fc199684cd1a51853d2845.tar.gz rails-a75dea08225285eec5fc199684cd1a51853d2845.tar.bz2 rails-a75dea08225285eec5fc199684cd1a51853d2845.zip | |
Merge pull request #34896 from bannzai/fix/active_record/mysql/enum_type_map
Allow space for mysql enum and set keyword.
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb | 4 |
2 files changed, 6 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 diff --git a/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb b/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb index 02e76ce146..38331aa641 100644 --- a/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb +++ b/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb @@ -27,8 +27,12 @@ if current_adapter?(:Mysql2Adapter) def test_string_types assert_lookup_type :string, "enum('one', 'two', 'three')" assert_lookup_type :string, "ENUM('one', 'two', 'three')" + assert_lookup_type :string, "enum ('one', 'two', 'three')" + assert_lookup_type :string, "ENUM ('one', 'two', 'three')" assert_lookup_type :string, "set('one', 'two', 'three')" assert_lookup_type :string, "SET('one', 'two', 'three')" + assert_lookup_type :string, "set ('one', 'two', 'three')" + assert_lookup_type :string, "SET ('one', 'two', 'three')" end def test_set_type_with_value_matching_other_type |