Created
March 23, 2011 16:53
-
-
Save josevalim/883459 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | |
index e40b328..c891178 100644 | |
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | |
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb | |
@@ -19,10 +19,10 @@ module ActiveRecord::Associations::Builder | |
name = self.name | |
model.send(:include, Module.new { | |
class_eval <<-RUBY, __FILE__, __LINE__ + 1 | |
- def destroy # def destroy | |
- super # super | |
- #{name}.clear # posts.clear | |
- end # end | |
+ def destroy_associations # def destroy_associations | |
+ #{name}.clear # posts.clear | |
+ super # super | |
+ end # end | |
RUBY | |
}) | |
end | |
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb | |
index 17a64b6..632917a 100644 | |
--- a/activerecord/lib/active_record/persistence.rb | |
+++ b/activerecord/lib/active_record/persistence.rb | |
@@ -75,6 +75,8 @@ module ActiveRecord | |
# Deletes the record in the database and freezes this instance to reflect | |
# that no changes should be made (since they can't be persisted). | |
def destroy | |
+ destroy_associations | |
+ | |
if persisted? | |
IdentityMap.remove(self) if IdentityMap.enabled? | |
self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).delete_all | |
@@ -251,6 +253,11 @@ module ActiveRecord | |
end | |
private | |
+ | |
+ # A hook to be overriden by association modules. | |
+ def destroy_associations | |
+ end | |
+ | |
def create_or_update | |
raise ReadOnlyRecord if readonly? | |
result = new_record? ? create : update |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment