diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-08-13 22:15:15 -0300 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-14 13:17:31 +0200 |
| commit | 36a84a4f15f29b41c7cac2f8de410055006a8a8d (patch) | |
| tree | 7dde55f401b7614db9f999344070ae25a1d8f629 | |
| parent | 48c7ad17b0e87d315b68c0075046fd29e8802e93 (diff) | |
| download | rails-36a84a4f15f29b41c7cac2f8de410055006a8a8d.tar.gz rails-36a84a4f15f29b41c7cac2f8de410055006a8a8d.tar.bz2 rails-36a84a4f15f29b41c7cac2f8de410055006a8a8d.zip | |
Makes AR use AMo to_key implementation
[#5249]
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/primary_keys_test.rb | 2 |
2 files changed, 1 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 82d94b848a..365fdeb55a 100644 --- a/activerecord/lib/active_record/attribute_methods/primary_key.rb +++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb @@ -3,12 +3,6 @@ module ActiveRecord module PrimaryKey extend ActiveSupport::Concern - # Returns this record's primary key value wrapped in an Array - # or nil if the record is a new_record? - def to_key - new_record? ? nil : [ id ] - end - module ClassMethods # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the # primary_key_prefix_type setting, though. diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb index 1e44237e0a..5cdcb05902 100644 --- a/activerecord/test/cases/primary_keys_test.rb +++ b/activerecord/test/cases/primary_keys_test.rb @@ -26,7 +26,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase def test_to_key_with_primary_key_after_destroy topic = Topic.find(1) topic.destroy - assert_equal [1], topic.to_key + assert_equal nil, topic.to_key end def test_integer_key |