diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index a66de990ad..a6258cee1e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixtures should only reset a PostgreSQL sequence if it corresponds to an integer primary key named id. #1749 [chris@chrisbrinker.com] + * Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior) * Added new symbol-driven approach to activating observers with Base#observers= [DHH]. Example: 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 |