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.

3 files changed, 17 insertions, 17 deletions

diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 5f4667b4d8..358ba2754b 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -51,9 +51,9 @@ module ActiveRecord
 
         # TODO - add dependent option support
         def delete_records(records)
-          klass = @reflection.through_reflection.klass
+          through_association = @owner.send(@reflection.through_reflection.name)
           records.each do |associate|
-            klass.delete_all(construct_join_attributes(associate))
+            through_association.where(construct_join_attributes(associate)).delete_all
           end
         end
 
diff --git a/activerecord/lib/active_record/associations/has_one_through_association.rb b/activerecord/lib/active_record/associations/has_one_through_association.rb
index eb17935d6a..2558941476 100644
--- a/activerecord/lib/active_record/associations/has_one_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_through_association.rb
@@ -13,20 +13,22 @@ module ActiveRecord
 
       private
 
-      def create_through_record(new_value) #nodoc:
-        klass = @reflection.through_reflection.klass
+      def create_through_record(new_value)
+        proxy  = @owner.send(@reflection.through_reflection.name) ||
+                 @owner.send(:association_instance_get, @reflection.through_reflection.name)
+        record = proxy.target
 
-        current_object = @owner.send(@reflection.through_reflection.name)
-
-        if current_object
-           new_value ? current_object.update_attributes(construct_join_attributes(new_value)) : current_object.destroy
+        if record && !new_value
+          record.destroy
         elsif new_value
-          if @owner.new_record?
-            self.target = new_value
-            through_association = @owner.send(:association_instance_get, @reflection.through_reflection.name)
-            through_association.build(construct_join_attributes(new_value))
+          attributes = construct_join_attributes(new_value)
+
+          if record
+            record.update_attributes(attributes)
+          elsif @owner.new_record?
+            proxy.build(attributes)
           else
-            @owner.send(@reflection.through_reflection.name, klass.create(construct_join_attributes(new_value)))
+            proxy.create(attributes)
           end
         end
       end
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)