kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Makes AR use AMo to_key implementation"

Browse source 
This reverts commit 36a84a4f15.
This commit is contained in:
Santiago Pastorino 2010-08-15 11:33:21 -03:00
parent d0cf212cb5
commit 3c8b50020a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/attribute_methods/primary_key.rb
View file

@ -3,6 +3,12 @@ module ActiveRecord
module PrimaryKey module PrimaryKey
extend ActiveSupport::Concern 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 module ClassMethods
# Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
# primary_key_prefix_type setting, though. # primary_key_prefix_type setting, though.

2
activerecord/test/cases/primary_keys_test.rb
View file

@ -26,7 +26,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase
def test_to_key_with_primary_key_after_destroy def test_to_key_with_primary_key_after_destroy
topic = Topic.find(1) topic = Topic.find(1)
topic.destroy topic.destroy
assert_equal nil, topic.to_key assert_equal [1], topic.to_key
end end
def test_integer_key def test_integer_key