aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/primary_keys_test.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-11-29 18:58:41 +0000
committerJon Leighton <j@jonathanleighton.com>2011-11-29 20:13:37 +0000
commit1a474cc8e41522ae079871d297c0e61ee4f6ef35 (patch)
tree23d2b2c2c74dc02f68ad6015bf35ce554096cdde /activerecord/test/cases/primary_keys_test.rb
parent4aad289428bf46cf4a13f159819f1993f8fc978f (diff)
downloadrails-1a474cc8e41522ae079871d297c0e61ee4f6ef35.tar.gz
rails-1a474cc8e41522ae079871d297c0e61ee4f6ef35.tar.bz2
rails-1a474cc8e41522ae079871d297c0e61ee4f6ef35.zip
Deprecate set_primary_key in favour of self.primary_key=
Diffstat (limited to 'activerecord/test/cases/primary_keys_test.rb')
-rw-r--r--activerecord/test/cases/primary_keys_test.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 4bb5752096..cc8ffb5f27 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -142,8 +142,6 @@ class PrimaryKeysTest < ActiveRecord::TestCase
assert_equal k.connection.quote_column_name("id"), k.quoted_primary_key
k.primary_key = "foo"
assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
- k.set_primary_key "bar"
- assert_equal k.connection.quote_column_name("bar"), k.quoted_primary_key
end
end
@@ -155,9 +153,8 @@ class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
connection = ActiveRecord::Base.remove_connection
- model = Class.new(ActiveRecord::Base) do
- set_primary_key 'foo'
- end
+ model = Class.new(ActiveRecord::Base)
+ model.primary_key = 'foo'
assert_equal 'foo', model.primary_key