Fix bug, when ':dependent => :destroy' option violates foreign key constraints, issue #12380

3 files changed, 18 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 1059fc032d..18d46b4849 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -69,7 +69,10 @@ module ActiveRecord::Associations::Builder
     end
 
     def define_callbacks(model, reflection)
-      add_before_destroy_callbacks(model, name) if options[:dependent]
+      if options[:dependent]
+        check_dependent_options
+        add_destroy_callbacks(model, name)
+      end
       Association.extensions.each do |extension|
         extension.build model, reflection
       end
@@ -110,12 +113,14 @@ module ActiveRecord::Associations::Builder
 
     private
 
-    def add_before_destroy_callbacks(model, name)
-      unless valid_dependent_options.include? options[:dependent]
-        raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{options[:dependent]}"
+      def check_dependent_options
+        unless valid_dependent_options.include? options[:dependent]
+          raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{options[:dependent]}"
+        end
       end
 
-      model.before_destroy lambda { |o| o.association(name).handle_dependency }
-    end
+      def add_destroy_callbacks(model, name)
+        model.before_destroy lambda { |o| o.association(name).handle_dependency }
+      end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index 4e88b50ec5..9c1bbad8ca 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -133,5 +133,9 @@ module ActiveRecord::Associations::Builder
       model.after_touch   callback
       model.after_destroy callback
     end
+
+    def add_destroy_callbacks(model, name)
+      model.after_destroy lambda { |o| o.association(name).handle_dependency }
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb
index 62d454ce55..066a787ff9 100644
--- a/activerecord/lib/active_record/associations/builder/has_one.rb
+++ b/activerecord/lib/active_record/associations/builder/has_one.rb
@@ -20,8 +20,8 @@ module ActiveRecord::Associations::Builder
 
     private
 
-    def add_before_destroy_callbacks(model, name)
-      super unless options[:through]
-    end
+      def add_destroy_callbacks(model, name)
+        super unless options[:through]
+      end
   end
 end