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/attribute_methods/primary_key.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/attribute_methods/primary_key.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb index 36d7f4ad11..a404a5edd7 100644 --- a/activerecord/lib/active_record/attribute_methods/primary_key.rb +++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb @@ -14,8 +14,6 @@ module ActiveRecord # primary_key_prefix_type setting, though. def primary_key @primary_key ||= reset_primary_key - raise ActiveRecord::UnknownPrimaryKey.new(self) unless @primary_key - @primary_key end # Returns a quoted version of the primary key name, used to construct SQL statements. @@ -31,11 +29,6 @@ module ActiveRecord key end - def primary_key? #:nodoc: - @primary_key ||= reset_primary_key - !@primary_key.nil? - end - def get_primary_key(base_name) #:nodoc: return 'id' unless base_name && !base_name.blank? |