diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 15:40:05 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 15:40:05 -0700 |
| commit | 9d70526ea9ca45a1e6e98ead682a9bfae98afc9f (patch) | |
| tree | 5d5c858410f56617d5acaacd2cf97e6295de0742 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | 1e5c274f59c0fe1764bea6bf778d11d0c0fc0b4f (diff) | |
| parent | d5ff01bcb3c88e8790494e6db16532e55e87fbc1 (diff) | |
| download | rails-9d70526ea9ca45a1e6e98ead682a9bfae98afc9f.tar.gz rails-9d70526ea9ca45a1e6e98ead682a9bfae98afc9f.tar.bz2 rails-9d70526ea9ca45a1e6e98ead682a9bfae98afc9f.zip | |
Merge pull request #22388 from kamipo/set_field_encoding_is_only_needed_for_mysql_adapter
`set_field_encoding` is only needed for `MysqlAdapter`
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, 2 insertions, 4 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 deef246c37..ee40e3a8d2 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -588,10 +588,8 @@ module ActiveRecord sql = "SHOW FULL FIELDS FROM #{quote_table_name(table_name)}" execute_and_free(sql, 'SCHEMA') do |result| each_hash(result).map do |field| - field_name = set_field_encoding(field[:Field]) - sql_type = field[:Type] - type_metadata = fetch_type_metadata(sql_type, field[:Extra]) - new_column(field_name, field[:Default], type_metadata, field[:Null] == "YES", nil, field[:Collation]) + type_metadata = fetch_type_metadata(field[:Type], field[:Extra]) + new_column(field[:Field], field[:Default], type_metadata, field[:Null] == "YES", nil, field[:Collation]) end end end |