diff options
| author | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
|---|---|---|
| committer | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
| commit | ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30 (patch) | |
| tree | 741019b3fbf474ff4cdeefdbeb6ff1f598ffcdfc /activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb | |
| parent | 8641de93eb98d4ebdb0db2530c8c79c0c4e2f95e (diff) | |
| parent | 688996da7b25080a1a2ef74f5b4789f3e5eb670d (diff) | |
| download | rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.gz rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.bz2 rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.zip | |
Merge remote-tracking branch 'origin/master' into actioncable_logging
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb')
| -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 |