Merge pull request #4376 from bogdan/after_initialize_on_dup

Fixed after_initialize callbacks call on AR model #dup

3 files changed, 14 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 0755379a74..89f6eccbd2 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -210,7 +210,7 @@ module ActiveRecord
 
       @attributes = cloned_attributes
 
-      _run_after_initialize_callbacks if respond_to?(:_run_after_initialize_callbacks)
+      _run_initialize_callbacks if _initialize_callbacks.any?
 
       @changed_attributes = {}
       self.class.column_defaults.each do |attr, orig_value|
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 0236f9b0a1..9705a11387 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -99,5 +99,13 @@ module ActiveRecord
       assert_not_nil new_topic.created_at
     end
 
+    def test_dup_after_initialize_callbacks
+      topic = Topic.new
+      assert Topic.after_initialize_called
+      Topic.after_initialize_called = false
+      topic.dup
+      assert Topic.after_initialize_called
+    end
+
   end
 end
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 1a1a18166a..8bcb9df8a8 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -80,6 +80,11 @@ class Topic < ActiveRecord::Base
 
   after_initialize :set_email_address
 
+  class_attribute :after_initialize_called
+  after_initialize do
+    self.class.after_initialize_called = true
+  end
+
   def approved=(val)
     @custom_approved = val
     write_attribute(:approved, val)