diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-23 19:53:52 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-26 18:46:58 +0000 |
| commit | 3eef0977e15d74518673e0bb3a9305cb41682dac (patch) | |
| tree | 807390526417474284d908cc8d028662099e9429 /activerecord/lib/active_record/associations/through_association_scope.rb | |
| parent | b5c30f9dacd73715830bbe53a45e98a7d2007d19 (diff) | |
| download | rails-3eef0977e15d74518673e0bb3a9305cb41682dac.tar.gz rails-3eef0977e15d74518673e0bb3a9305cb41682dac.tar.bz2 rails-3eef0977e15d74518673e0bb3a9305cb41682dac.zip | |
Use the through association proxy for operations on the through record, so that those operations are automatically scoped and therefore construct_join_attributes does not need to use construct_owner_attributes.
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association_scope.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association_scope.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb index e57de84f66..7cb039859c 100644 --- a/activerecord/lib/active_record/associations/through_association_scope.rb +++ b/activerecord/lib/active_record/associations/through_association_scope.rb @@ -117,12 +117,10 @@ module ActiveRecord # TODO: revisit this to allow it for deletion, supposing dependent option is supported raise ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(@owner, @reflection) if [:has_one, :has_many].include?(@reflection.source_reflection.macro) - join_attributes = construct_owner_attributes(@reflection.through_reflection) - - join_attributes.merge!( + join_attributes = { @reflection.source_reflection.primary_key_name => associate.send(@reflection.source_reflection.association_primary_key) - ) + } if @reflection.options[:source_type] join_attributes.merge!(@reflection.source_reflection.options[:foreign_type] => associate.class.base_class.name) |