Remove the dependent_restrict_raises option.

It's not really a good idea to have this as a global config option. We
should allow people to specify the behaviour per association.

There will now be two new values:

* :dependent => :restrict_with_exception implements the current
  behaviour of :restrict. :restrict itself is deprecated in favour of
  :restrict_with_exception.
* :dependent => :restrict_with_error implements the new behaviour - it
  adds an error to the owner if there are dependent records present

See #4727 for the original discussion of this.

3 files changed, 22 insertions, 23 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index c3f32b5ed9..47f06421ee 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -85,35 +85,35 @@ module ActiveRecord::Associations::Builder
           raise ArgumentError, "The :dependent option expects either " \
             "#{valid_options_message} (#{dependent.inspect})"
         end
-      end
 
-      def dependent_restrict_raises?
-        ActiveRecord::Base.dependent_restrict_raises == true
+        if dependent == :restrict
+          ActiveSupport::Deprecation.warn(
+            "The :restrict option is deprecated. Please use :restrict_with_exception instead, which " \
+            "provides the same functionality."
+          )
+        end
       end
 
-      def dependent_restrict_deprecation_warning
-        if dependent_restrict_raises?
-          msg = "In the next release, `:dependent => :restrict` will not raise a `DeleteRestrictionError`. "\
-                "Instead, it will add an error on the model. To fix this warning, make sure your code " \
-                "isn't relying on a `DeleteRestrictionError` and then add " \
-                "`config.active_record.dependent_restrict_raises = false` to your application config."
-          ActiveSupport::Deprecation.warn msg
+      def define_restrict_with_exception_dependency_method
+        name = self.name
+        mixin.redefine_method(dependency_method_name) do
+          has_one_macro = association(name).reflection.macro == :has_one
+          if has_one_macro ? !send(name).nil? : send(name).exists?
+            raise ActiveRecord::DeleteRestrictionError.new(name)
+          end
         end
       end
+      alias define_restrict_dependency_method define_restrict_with_exception_dependency_method
 
-      def define_restrict_dependency_method
+      def define_restrict_with_error_dependency_method
         name = self.name
         mixin.redefine_method(dependency_method_name) do
           has_one_macro = association(name).reflection.macro == :has_one
           if has_one_macro ? !send(name).nil? : send(name).exists?
-            if dependent_restrict_raises?
-              raise ActiveRecord::DeleteRestrictionError.new(name)
-            else
-              key  = has_one_macro ? "one" : "many"
-              errors.add(:base, :"restrict_dependent_destroy.#{key}",
-                         :record => self.class.human_attribute_name(name).downcase)
-              return false
-            end
+            key  = has_one_macro ? "one" : "many"
+            errors.add(:base, :"restrict_dependent_destroy.#{key}",
+                       :record => self.class.human_attribute_name(name).downcase)
+            false
           end
         end
       end
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index 9e60dbc30b..63278c8cfd 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -19,8 +19,8 @@ module ActiveRecord::Associations::Builder
 
       def configure_dependency
         if dependent = options[:dependent]
-          check_valid_dependent! dependent, [:destroy, :delete_all, :nullify, :restrict]
-          dependent_restrict_deprecation_warning if dependent == :restrict
+          check_valid_dependent! dependent, [:destroy, :delete_all, :nullify, :restrict,
+                                             :restrict_with_error, :restrict_with_exception]
 
           send("define_#{dependent}_dependency_method")
           model.before_destroy dependency_method_name
diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb
index 9c84f1913a..82c5905caf 100644
--- a/activerecord/lib/active_record/associations/builder/has_one.rb
+++ b/activerecord/lib/active_record/associations/builder/has_one.rb
@@ -25,8 +25,7 @@ module ActiveRecord::Associations::Builder
 
       def configure_dependency
         if dependent = options[:dependent]
-          check_valid_dependent! dependent, [:destroy, :delete, :nullify, :restrict]
-          dependent_restrict_deprecation_warning if dependent == :restrict
+          check_valid_dependent! dependent, [:destroy, :delete, :nullify, :restrict, :restrict_with_error, :restrict_with_exception]
 
           send("define_#{dependent}_dependency_method")
           model.before_destroy dependency_method_name