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/persistence.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/persistence.rb')
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index b5dadb929d..5e65e46a7d 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -314,7 +314,7 @@ module ActiveRecord new_id = self.class.unscoped.insert attributes_values - self.id ||= new_id if self.class.primary_key? + self.id ||= new_id if self.class.primary_key IdentityMap.add(self) if IdentityMap.enabled? @new_record = false |