diff options
author | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-09-01 18:05:04 +0530 |
---|---|---|
committer | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-09-01 18:05:04 +0530 |
commit | 6b9b0767bf480d53029afeb3f8e86f66e933fb41 (patch) | |
tree | 62a76c76b8fce484d8a258aceb14ac475f2c94a8 /activerecord/lib/active_record/reflection.rb | |
parent | b27c40637aaf2549f91faec8e87f6d4afa9a7380 (diff) | |
parent | ab0cbff07ebb5df8c9354fa2b3fd9984e039d2c6 (diff) | |
download | rails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.tar.gz rails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.tar.bz2 rails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
-rw-r--r-- | activerecord/lib/active_record/reflection.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index f428f160cf..5245fc130a 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -422,7 +422,6 @@ module ActiveRecord def valid_inverse_reflection?(reflection) reflection && klass.name == reflection.active_record.name && - klass.primary_key == reflection.active_record_primary_key && can_find_inverse_of_automatically?(reflection) end |