From a68557952fd6caac526769beb699c7936cef001f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 26 Sep 2005 11:56:16 +0000 Subject: r3569@asus: jeremy | 2005-09-26 05:33:09 -0700 Ticket 1749 - reset_sequences workaround for non-integer sequences r3570@asus: jeremy | 2005-09-26 08:30:30 -0700 Fixtures.reset_sequences should only reset sequences corresponding to integer primary keys named id. #1749 r3571@asus: jeremy | 2005-09-26 08:31:11 -0700 Update change log. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2343 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/fixtures.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 1e5fc8b08b..50e45e10e6 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -246,15 +246,15 @@ class Fixtures < Hash end end - # Work around for PostgreSQL to have new fixtures created from id 1 and running. + # Start PostgreSQL fixtures at id 1. Skip tables without models + # and models with nonstandard primary keys. def self.reset_sequences(connection, table_names) table_names.flatten.each do |table| - table_class = Inflector.classify(table.to_s) - if Object.const_defined?(table_class) - pk = eval("#{table_class}::primary_key") - if pk == 'id' + if table_class = table.to_s.classify.constantize rescue nil + pk = table_class.columns_hash[table_class.primary_key] + if pk and pk.name == 'id' and pk.type == :integer connection.execute( - "SELECT setval('#{table.to_s}_id_seq', (SELECT MAX(id) FROM #{table.to_s}), true)", + "SELECT setval('#{table}_id_seq', (SELECT MAX(id) FROM #{table}), true)", 'Setting Sequence' ) end -- cgit v1.2.3