diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-10-05 18:11:25 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-10-05 20:21:21 +0100 |
| commit | 64747654ca661d695622c0ad9e33b8d9e6df8048 (patch) | |
| tree | 953314bcf3e51aa784a600cfe09bee7280e79743 /activerecord/lib/active_record/transactions.rb | |
| parent | fd8f0b297822ba36002084faa36bd0320d3be4a7 (diff) | |
| download | rails-64747654ca661d695622c0ad9e33b8d9e6df8048.tar.gz rails-64747654ca661d695622c0ad9e33b8d9e6df8048.tar.bz2 rails-64747654ca661d695622c0ad9e33b8d9e6df8048.zip | |
Revert "Raise error on unknown primary key."
This reverts commit ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index d4870dd3f2..ae97a3f3ca 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -303,7 +303,7 @@ module ActiveRecord # Save the new record state and id of a record so it can be restored later if a transaction fails. def remember_transaction_record_state #:nodoc @_start_transaction_state ||= {} - @_start_transaction_state[:id] = id if self.class.primary_key? + @_start_transaction_state[:id] = id if has_attribute?(self.class.primary_key) unless @_start_transaction_state.include?(:new_record) @_start_transaction_state[:new_record] = @new_record end |