Changeset 8675

Timestamp:

01/19/08 05:30:42 (8 months ago)

Author:

bitsweat

Message:

belongs_to supports :dependent => :destroy and :delete. Closes #10592.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (3 diffs)
• trunk/activerecord/test/cases/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/json_serialization_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/authors.yml (modified) (1 diff)
• trunk/activerecord/test/models/author.rb (modified) (2 diffs)
• trunk/activerecord/test/schema/schema.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* belongs_to supports :dependent => :destroy and :delete.  #10592 [Jonathan Viney]
-
-* Introduce preload query strategy for eager :includes.  #9640 [Frederick Cheung, Aleksey Kondratenko]

trunk/activerecord/lib/active_record/associations.rb

@@ -793 +793 @@
-      #   of the association with an +_id+ suffix. So a class that defines a +belongs_to :person+ association will use +person_id+ as the default +foreign_key+.
-      #   Similarly, +belongs_to :favorite_person, :class_name => "Person"+ will use a foreign key of +favorite_person_id+.
+      # * <tt>:dependent</tt>   - if set to <tt>:destroy</tt>, the associated object is destroyed when this object is. If set to
+      #   <tt>:delete</tt>, the associated object is deleted *without* calling its destroy method. This option should not be specified when
+      #   <tt>belongs_to</tt> is used in conjunction with a <tt>has_many</tt> relationship on another class because of the potential to leave
+      #   orphaned records behind.
-      # * <tt>:counter_cache</tt> - caches the number of belonging objects on the associate class through the use of +increment_counter+
-      #   and +decrement_counter+. The counter cache is incremented when an object of this class is created and decremented when it's
@@ -877 +881 @@
-          )
-        end
+
+        configure_dependency_for_belongs_to(reflection)
-      end
-
@@ -1203 +1209 @@
-        end
-
+        def configure_dependency_for_belongs_to(reflection)
+          if reflection.options.include?(:dependent)
+            case reflection.options[:dependent]
+              when :destroy
+                module_eval "before_destroy '#{reflection.name}.destroy unless #{reflection.name}.nil?'"
+              when :delete
+                module_eval "before_destroy '#{reflection.class_name}.delete(#{reflection.name}.id) unless #{reflection.name}.nil?'"
+              else
+                raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
+            end
+          end
+        end
+
-        def create_has_many_reflection(association_id, options, &extension)
-          options.assert_valid_keys(

trunk/activerecord/test/cases/associations_test.rb

@@ -471 +471 @@
-class HasManyAssociationsTest < ActiveSupport::TestCase
-  fixtures :accounts, :companies, :developers, :projects,
-
+, :author_addresses
-
-  def setup
@@ -994 +994 @@
-    # only the correctly associated client should have been deleted
-    assert_equal 1, Client.find_all_by_client_of(firm.id).size
+  end
+
+  def test_dependent_delete_and_destroy_with_belongs_to
+    author_address = author_addresses(:david_address)
+    assert_equal [], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
+
+    assert_difference "AuthorAddress.count", -2 do
+      authors(:david).destroy
+    end
+
+    assert_equal [author_address.id], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
+  end
+
+  def test_invalid_belongs_to_dependent_option_raises_exception
+    assert_raises ArgumentError do
+      Author.belongs_to :special_author_address, :dependent => :nullify
+    end
-  end
-

trunk/activerecord/test/cases/json_serialization_test.rb

@@ -152 +152 @@
-    authors = [@david, @mary]
-
-
+, :author_address_extra_id
-  end
-

trunk/activerecord/test/fixtures/authors.yml

@@ -2 +2 @@
-  id: 1
-  name: David
+  author_address_id: 1
+  author_address_extra_id: 2
-
-mary:

trunk/activerecord/test/models/author.rb

@@ -66 +66 @@
-  has_many :post_categories, :through => :posts, :source => :categories
-
-
+
+
-
-  attr_accessor :post_log
@@ -102 +103 @@
-class AuthorAddress < ActiveRecord::Base
-  has_one :author
+
+  def self.destroyed_author_address_ids
+    @destroyed_author_address_ids ||= Hash.new { |h,k| h[k] = [] }
+  end
+
+  before_destroy do |author_address|
+    if author_address.author
+      AuthorAddress.destroyed_author_address_ids[author_address.author.id] << author_address.id
+    end
+    true
+  end
-end
-

trunk/activerecord/test/schema/schema.rb

@@ -240 +240 @@
-  add_column :posts, :taggings_count, :integer, :default => 0
-  add_column :authors, :author_address_id, :integer
+  add_column :authors, :author_address_extra_id, :integer
-
-  create_table :author_addresses, :force => true do |t|
-    t.column :author_address_id, :integer
-  end
-