diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:49:23 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:49:23 +0200 |
| commit | b7921f50e7cb08bbfddacbcc46b22dc74738cc5c (patch) | |
| tree | a87d6c7e692bbf7eb75fd34ab8610f6d16369585 /activerecord/lib/active_record/reflection.rb | |
| parent | 00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (diff) | |
| parent | 6b436c23a90cb3bb2e2d55902a55fc6f659b90be (diff) | |
| download | rails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.tar.gz rails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.tar.bz2 rails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index a058e880ca..6df473d011 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -1,5 +1,4 @@ require 'active_support/core_ext/class/attribute' -require 'active_support/core_ext/module/deprecation' require 'active_support/core_ext/object/inclusion' module ActiveRecord @@ -202,11 +201,6 @@ module ActiveRecord @foreign_key ||= options[:foreign_key] || derive_foreign_key end - def primary_key_name - foreign_key - end - deprecate :primary_key_name => :foreign_key - def foreign_type @foreign_type ||= options[:foreign_type] || "#{name}_type" end |