diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-07 16:33:33 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-07 16:33:33 -0700 |
| commit | a29a41fe54c5ec39983aed81a7370235c5f4f58a (patch) | |
| tree | 8c4f0430895f6d592b93c28452b412ca03af7858 /activerecord/lib/active_record/connection_adapters/postgresql | |
| parent | 5ccf8a9853d4a190cd4929ac0f6d736884c1dc80 (diff) | |
| parent | bf25ab9523e628c83ca4bd26a4b4d1d1ca84f723 (diff) | |
| download | rails-a29a41fe54c5ec39983aed81a7370235c5f4f58a.tar.gz rails-a29a41fe54c5ec39983aed81a7370235c5f4f58a.tar.bz2 rails-a29a41fe54c5ec39983aed81a7370235c5f4f58a.zip | |
Merge pull request #23547 from kamipo/schema_type_returns_symbol
`schema_type` returns symbol rather than string
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb index cc7721ddd8..b82bdb8b0c 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb @@ -11,7 +11,7 @@ module ActiveRecord spec[:id] = ':uuid' spec[:default] = schema_default(column) || 'nil' else - spec[:id] = column.type.inspect + spec[:id] = schema_type(column).inspect spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type, :null].include?(key) }) end spec @@ -35,9 +35,9 @@ module ActiveRecord return super unless column.serial? if column.bigint? - 'bigserial' + :bigserial else - 'serial' + :serial end end |