aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/schema_dumper.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremykemper@gmail.com>2014-09-07 18:37:00 -0700
committerJeremy Kemper <jeremykemper@gmail.com>2014-09-07 18:37:00 -0700
commit23d1b92f97ca1d81847fb5ee5b581da5324334fe (patch)
treef6d8e94c7b2d57105d16fe85ad071ea4d0a079ed /activerecord/lib/active_record/schema_dumper.rb
parent353b88135f14a928352d4cf2f5f8e4ddacbd9d4a (diff)
downloadrails-23d1b92f97ca1d81847fb5ee5b581da5324334fe.tar.gz
rails-23d1b92f97ca1d81847fb5ee5b581da5324334fe.tar.bz2
rails-23d1b92f97ca1d81847fb5ee5b581da5324334fe.zip
Schema dumper: all connection adapters implement #primary_key, so rely on it exclusively
Diffstat (limited to 'activerecord/lib/active_record/schema_dumper.rb')
-rw-r--r--activerecord/lib/active_record/schema_dumper.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index b560c58a66..68d976c240 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -105,22 +105,13 @@ HEADER
end
end
- def primary_key_for(table)
- if @connection.respond_to?(:pk_and_sequence_for)
- pk, _ = @connection.pk_and_sequence_for(table)
- return pk if pk
- end
- return @connection.primary_key(table) if @connection.respond_to?(:primary_key)
- nil
- end
-
def table(table, stream)
columns = @connection.columns(table)
begin
tbl = StringIO.new
# first dump primary key column
- pk = primary_key_for(table)
+ pk = @connection.primary_key(table)
tbl.print " create_table #{remove_prefix_and_suffix(table).inspect}"
pkcol = columns.detect { |c| c.name == pk }