Merge pull request #38917 from eugeneius/rm_active_record_define_call…

…backs Remove ActiveRecord::DefineCallbacks module
rails · Apr 10, 2020 · fb4a3fb · fb4a3fb
2 parents 6d6d4b9 + 6517263
commit fb4a3fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
@@ -6,7 +6,6 @@
 require "active_support/time"
 require "active_support/core_ext/class/subclasses"
 require "active_record/attribute_decorators"
-require "active_record/define_callbacks"
 require "active_record/log_subscriber"
 require "active_record/explain_subscriber"
 require "active_record/relation/delegation"
@@ -296,7 +295,6 @@ class Base
     include AttributeDecorators
     include Locking::Optimistic
     include Locking::Pessimistic
-    include DefineCallbacks
     include AttributeMethods
     include Callbacks
     include Timestamp

diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
@@ -301,6 +301,17 @@ module Callbacks
       :before_destroy, :around_destroy, :after_destroy, :after_commit, :after_rollback
     ]
 
+    module ClassMethods # :nodoc:
+      include ActiveModel::Callbacks
+    end
+
+    included do
+      include ActiveModel::Validations::Callbacks
+
+      define_model_callbacks :initialize, :find, :touch, only: :after
+      define_model_callbacks :save, :create, :update, :destroy
+    end
+
     def destroy #:nodoc:
       @_destroy_callback_already_called ||= false
       return if @_destroy_callback_already_called

diff --git a/activerecord/lib/active_record/define_callbacks.rb b/activerecord/lib/active_record/define_callbacks.rb
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -16,7 +16,6 @@ def self.superclass; Base; end
           def self.base_class?; true; end
           def self.decorate_matching_attribute_types(*); end
 
-          include ActiveRecord::DefineCallbacks
           include ActiveRecord::AttributeMethods
 
           def self.attribute_names