aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-10 22:31:49 -0300
committerGitHub <noreply@github.com>2016-10-10 22:31:49 -0300
commit469dd36af14ec20197910fb5cd2fd47f7612ef09 (patch)
tree523e45dcbfe398a1f047c3e5305a0742f4481e0d /activerecord/lib/active_record/connection_adapters/abstract
parent3c8f26ac14eb8fc8db45cf5ed020ce1227ce3859 (diff)
parent1fa97c76d6b528d0c1f9affe0ebb0092f39eecf8 (diff)
downloadrails-469dd36af14ec20197910fb5cd2fd47f7612ef09.tar.gz
rails-469dd36af14ec20197910fb5cd2fd47f7612ef09.tar.bz2
rails-469dd36af14ec20197910fb5cd2fd47f7612ef09.zip
Merge pull request #26756 from kamipo/extract_format_colspec
Extract `format_colspec` to format column spec
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
index bc378c0476..06c89ca072 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
@@ -7,9 +7,7 @@ module ActiveRecord
# Adapter level by over-writing this code inside the database specific adapters
module ColumnDumper
def column_spec(column)
- spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
- spec[:type] = schema_type(column).to_s
- spec
+ [schema_type(column), prepare_column_options(column)]
end
def column_spec_for_primary_key(column)