Permalink
Browse files

DRYed up Associations#clear. Closes #1906 [Caleb]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 4a1ed01 commit 5fa8793f02b58509a90eed69e8dc3d199f89b4ad Tobias Lütke committed Oct 14, 2005
View
@@ -1,4 +1,6 @@
-*SVN*
+*SVN*
+
+* Simplified .clear on active record associations by using the existing delete_records method. #1906 [Caleb <me@cpb.ca>]
* Delegate access to a customized primary key to the conventional id method. #2444. [Blair Zajac <blair@orcaware.com>]
@@ -33,6 +33,12 @@ def <<(*records)
alias_method :push, :<<
alias_method :concat, :<<
+
+ # Remove all records from this association
+ def delete_all
+ delete(@target)
+ @target = []
+ end
# Remove +records+ from this association. Does not destroy +records+.
def delete(*records)
@@ -50,6 +56,17 @@ def delete(*records)
end
end
end
+
+ # Removes all records from this association. Returns +self+ so method calls may be chained.
+ def clear
+ return self if empty? # forces load_target if hasn't happened already
+ if @options[:exclusively_dependent]
+ destroy_all
+ else
+ delete_all
+ end
+ self
+ end
def destroy_all
@owner.transaction do
@@ -19,26 +19,6 @@ def build(attributes = {})
record
end
- # Removes all records from this association. Returns +self+ so method calls may be chained.
- def clear
- return self if size == 0 # forces load_target if hasn't happened already
-
- if sql = @options[:delete_sql]
- each { |record| @owner.connection.execute(sql) }
- elsif @options[:conditions]
- sql =
- "DELETE FROM #{@join_table} WHERE #{@association_class_primary_key_name} = #{@owner.quoted_id} " +
- "AND #{@association_foreign_key} IN (#{collect { |record| record.id }.join(", ")})"
- @owner.connection.execute(sql)
- else
- sql = "DELETE FROM #{@join_table} WHERE #{@association_class_primary_key_name} = #{@owner.quoted_id}"
- @owner.connection.execute(sql)
- end
-
- @target = []
- self
- end
-
def find_first
load_target.first
end
@@ -83,20 +83,6 @@ def find(*args)
@association_class.find(*args)
end
end
-
- # Removes all records from this association. Returns +self+ so
- # method calls may be chained.
- def clear
- if @options[:dependent]
- each { |associate| associate.destroy }
- elsif @options[:exclusively_dependent]
- @association_class.delete_all("#{@association_class_primary_key_name} = #{@owner.quoted_id}")
- else
- @association_class.update_all("#{@association_class_primary_key_name} = NULL", "#{@association_class_primary_key_name} = #{@owner.quoted_id}")
- end
- @target = []
- self
- end
protected
def find_target
@@ -83,6 +83,20 @@ def test_has_and_belongs_to_many_remove_callback
assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}",
"after_removing#{jamis.id}"], activerecord.developers_log
end
+
+ def test_has_and_belongs_to_many_remove_callback_on_clear
+ activerecord = projects(:active_record)
+ assert activerecord.developers_log.empty?
+ if activerecord.developers_with_callbacks.size == 0
+ activerecord.developers << developers(:david)
+ activerecord.developers << developers(:jamis)
+ activerecord.reload
+ assert activerecord.developers_with_callbacks.size == 2
+ end
+ log_array = activerecord.developers_with_callbacks.collect {|d| ["before_removing#{d.id}","after_removing#{d.id}"]}.flatten.sort
+ assert activerecord.developers_with_callbacks.clear
+ assert_equal log_array, activerecord.developers_log.sort
+ end
def test_dont_add_if_before_callback_raises_exception
assert !@david.unchangable_posts.include?(@authorless)
@@ -551,13 +551,15 @@ def test_clearing_an_exclusively_dependent_association_collection
client_id = firm.exclusively_dependent_clients_of_firm.first.id
assert_equal 1, firm.exclusively_dependent_clients_of_firm.size
+ assert_equal [], Client.destroyed_client_ids[firm.id]
+
# :exclusively_dependent means each client is deleted directly from
# the database without looping through them calling destroy.
firm.exclusively_dependent_clients_of_firm.clear
assert_equal 0, firm.exclusively_dependent_clients_of_firm.size
assert_equal 0, firm.exclusively_dependent_clients_of_firm(true).size
- assert_equal [], Client.destroyed_client_ids[firm.id]
+ assert_equal [3], Client.destroyed_client_ids[firm.id]
# Should be destroyed since the association is exclusively dependent.
assert Client.find_by_id(client_id).nil?

0 comments on commit 5fa8793

Please sign in to comment.