diff options
Diffstat (limited to 'activerecord/lib/active_record/associations')
5 files changed, 50 insertions, 77 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index ce1c8a262d..73f22cb0fa 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -13,6 +13,14 @@ module ActiveRecord @loaded = false end + def build(attributes = {}) + if attributes.is_a?(Array) + attributes.collect { |attr| build(attr) } + else + build_record(attributes) { |record| set_belongs_to_association_for(record) } + end + end + # Add +records+ to this association. Returns +self+ so method calls may be chained. # Since << flattens its argument list and inserts each record, +push+ and +concat+ behave identically. def <<(*records) @@ -55,7 +63,13 @@ module ActiveRecord def delete(*records) records = flatten_deeper(records) records.each { |record| raise_on_type_mismatch(record) } - records.reject! { |record| @target.delete(record) if record.new_record? } + records.reject! do |record| + if record.new_record? + callback(:before_remove, record) + @target.delete(record) + callback(:after_remove, record) + end + end return if records.empty? @owner.transaction do diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 26274fff93..df21124e92 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -7,10 +7,10 @@ module ActiveRecord # HasOneAssociation # BelongsToPolymorphicAssociation # AssociationCollection - # HasManyAssociation # HasAndBelongsToManyAssociation - # HasManyThroughAssociation - # HasOneThroughAssociation + # HasManyAssociation + # HasManyThroughAssociation + # HasOneThroughAssociation # # Association proxies in Active Record are middlemen between the object that # holds the association, known as the <tt>@owner</tt>, and the actual associated diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index 0edb2397ee..8ce5b83831 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -6,10 +6,6 @@ module ActiveRecord construct_sql end - def build(attributes = {}) - build_record(attributes) - end - def create(attributes = {}) create_record(attributes) { |record| insert_record(record) } end diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index de6b843098..6cf10c2192 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -6,14 +6,6 @@ module ActiveRecord construct_sql end - def build(attributes = {}) - if attributes.is_a?(Array) - attributes.collect { |attr| build(attr) } - else - build_record(attributes) { |record| set_belongs_to_association_for(record) } - end - end - # Count the number of associated records. All arguments are optional. def count(*args) if @reflection.options[:counter_sql] 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 7d418ba701..23cead3ca6 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -1,13 +1,13 @@ module ActiveRecord module Associations - class HasManyThroughAssociation < AssociationCollection #:nodoc: + class HasManyThroughAssociation < HasManyAssociation #:nodoc: def initialize(owner, reflection) super reflection.check_validity! @finder_sql = construct_conditions - construct_sql end + def find(*args) options = args.extract_options! @@ -35,65 +35,6 @@ module ActiveRecord @reflection.klass.find(*args) end - def reset - @target = [] - @loaded = false - end - - # Adds records to the association. The source record and its associates - # must have ids in order to create records associating them, so this - # will raise ActiveRecord::HasManyThroughCantAssociateNewRecords if - # either is a new record. Calls create! so you can rescue errors. - # - # The :before_add and :after_add callbacks are not yet supported. - def <<(*records) - return if records.empty? - through = @reflection.through_reflection - raise ActiveRecord::HasManyThroughCantAssociateNewRecords.new(@owner, through) if @owner.new_record? - - klass = through.klass - klass.transaction do - flatten_deeper(records).each do |associate| - raise_on_type_mismatch(associate) - raise ActiveRecord::HasManyThroughCantAssociateNewRecords.new(@owner, through) unless associate.respond_to?(:new_record?) && !associate.new_record? - - @owner.send(@reflection.through_reflection.name).proxy_target << klass.send(:with_scope, :create => construct_join_attributes(associate)) { klass.create! } - @target << associate if loaded? - end - end - - self - end - - [:push, :concat].each { |method| alias_method method, :<< } - - # Removes +records+ from this association. Does not destroy +records+. - def delete(*records) - records = flatten_deeper(records) - records.each { |associate| raise_on_type_mismatch(associate) } - - through = @reflection.through_reflection - raise ActiveRecord::HasManyThroughCantDissociateNewRecords.new(@owner, through) if @owner.new_record? - - load_target - - klass = through.klass - klass.transaction do - flatten_deeper(records).each do |associate| - raise_on_type_mismatch(associate) - raise ActiveRecord::HasManyThroughCantDissociateNewRecords.new(@owner, through) unless associate.respond_to?(:new_record?) && !associate.new_record? - - klass.delete_all(construct_join_attributes(associate)) - @target.delete(associate) - end - end - - self - end - - def build(attrs = nil) - raise ActiveRecord::HasManyThroughCantAssociateNewRecords.new(@owner, @reflection.through_reflection) - end alias_method :new, :build def create!(attrs = nil) @@ -103,6 +44,13 @@ module ActiveRecord end end + def create(attrs = nil) + @reflection.klass.transaction do + self << (object = @reflection.klass.send(:with_scope, :create => attrs) { @reflection.klass.create }) + object + end + end + # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and # calling collection.size if it has. If it's more likely than not that the collection does have a size larger than zero # and you need to fetch that collection afterwards, it'll take one less SELECT query if you use length. @@ -131,7 +79,28 @@ module ActiveRecord @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.count(column_name, options) } end + protected + def insert_record(record, force=true) + if record.new_record? + if force + record.save! + else + return false unless record.save + end + end + klass = @reflection.through_reflection.klass + @owner.send(@reflection.through_reflection.name).proxy_target << klass.send(:with_scope, :create => construct_join_attributes(record)) { klass.create! } + end + + # TODO - add dependent option support + def delete_records(records) + klass = @reflection.through_reflection.klass + records.each do |associate| + klass.delete_all(construct_join_attributes(associate)) + end + end + def method_missing(method, *args) if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) if block_given? @@ -178,6 +147,8 @@ module ActiveRecord # Construct attributes for :through pointing to owner and associate. def construct_join_attributes(associate) + # TODO: revist this to allow it for deletion, supposing dependent option is supported + raise ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection.new(@owner, @reflection) if @reflection.source_reflection.macro == :has_many join_attributes = construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.primary_key_name => associate.id) if @reflection.options[:source_type] join_attributes.merge!(@reflection.source_reflection.options[:foreign_type] => associate.class.base_class.name.to_s) |