Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use the through association proxy for operations on the through recor…

…d, so that those operations are automatically scoped and therefore construct_join_attributes does not need to use construct_owner_attributes.
  • Loading branch information...
commit 3eef0977e15d74518673e0bb3a9305cb41682dac 1 parent b5c30f9
@jonleighton jonleighton authored
View
4 activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -51,9 +51,9 @@ def insert_record(record, force = true, validate = true)
# 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
View
24 activerecord/lib/active_record/associations/has_one_through_association.rb
@@ -13,20 +13,22 @@ def replace(new_value)
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
View
6 activerecord/lib/active_record/associations/through_association_scope.rb
@@ -117,12 +117,10 @@ def construct_join_attributes(associate)
# 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)
Please sign in to comment.
Something went wrong with that request. Please try again.