diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-01-01 18:52:48 +0000 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 16:24:31 -0800 |
| commit | c47f802d0e7b0156512f197887d6e9bda6d0f269 (patch) | |
| tree | 126e6c305f43ae4d5a48cc94cb01b5aa1c2cc1a7 /activerecord/lib/active_record/associations/class_methods | |
| parent | d18a27031f8794b0134645eb0d62ec16653ac537 (diff) | |
| download | rails-c47f802d0e7b0156512f197887d6e9bda6d0f269.tar.gz rails-c47f802d0e7b0156512f197887d6e9bda6d0f269.tar.bz2 rails-c47f802d0e7b0156512f197887d6e9bda6d0f269.zip | |
Have a proper AssociationReflection#foreign_type method rather than using options[:foreign_type]
Diffstat (limited to 'activerecord/lib/active_record/associations/class_methods')
| -rw-r--r-- | activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb index 1e5149d80f..3fea24ebf8 100644 --- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb @@ -228,7 +228,7 @@ module ActiveRecord second_key = source_reflection.association_foreign_key jt_conditions << - join_table[reflection.source_reflection.options[:foreign_type]]. + join_table[reflection.source_reflection.foreign_type]. eq(reflection.options[:source_type]) else second_key = source_reflection.foreign_key |