diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-07-14 19:50:27 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-07-14 19:50:27 +0930 |
| commit | defc68004d2a8d3d66d5f4893e34ba9917d97e83 (patch) | |
| tree | e4e59b12aed6cf42c0d36f45ca4ce64e5bae5ac7 /activerecord/lib | |
| parent | 2fc823924ae2e68c1306be1418ee6a14132f3140 (diff) | |
| parent | 584fc8b33b66aa47b2ecabedbdca7c66f16653d7 (diff) | |
| download | rails-defc68004d2a8d3d66d5f4893e34ba9917d97e83.tar.gz rails-defc68004d2a8d3d66d5f4893e34ba9917d97e83.tar.bz2 rails-defc68004d2a8d3d66d5f4893e34ba9917d97e83.zip | |
Merge pull request #16127 from Envek/fix_16111
Dump PostgreSQL primary key with custom function as a default.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 64bc68eefd..a94364bde1 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -120,7 +120,8 @@ HEADER # first dump primary key column if @connection.respond_to?(:pk_and_sequence_for) pk, _ = @connection.pk_and_sequence_for(table) - elsif @connection.respond_to?(:primary_key) + end + if !pk && @connection.respond_to?(:primary_key) pk = @connection.primary_key(table) end |