diff options
-rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 80cf933555..aa61487285 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -173,13 +173,9 @@ module ActiveRecord end end - def find_join_association(name_or_reflection, parent) - if String === name_or_reflection - name_or_reflection = name_or_reflection.to_sym - end - + def find_join_association(reflection, parent) join_associations.detect { |j| - j.reflection == name_or_reflection && j.parent == parent + j.reflection == reflection && j.parent == parent } end |