Merge pull request #16015 from sgrif/sg-ensure-initialized

Move pk initialization logic onto `AttributeSet`

Conflicts:
	activerecord/lib/active_record/attribute_set.rb

2 files changed, 7 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/attribute_set.rb b/activerecord/lib/active_record/attribute_set.rb
index df4fd31e08..64df6f6358 100644
--- a/activerecord/lib/active_record/attribute_set.rb
+++ b/activerecord/lib/active_record/attribute_set.rb
@@ -58,6 +58,12 @@ module ActiveRecord
       end
     end
 
+    def ensure_initialized(key)
+      unless self[key].initialized?
+        write_from_database(key, nil)
+      end
+    end
+
     protected
 
     attr_reader :attributes
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 30b8485c8b..b11c4f804f 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -514,10 +514,7 @@ module ActiveRecord
     end
 
     def init_internals
-      pk = self.class.primary_key
-      if pk && !@attributes.include?(pk)
-        @attributes.write_from_database(pk, nil)
-      end
+      @attributes.ensure_initialized(self.class.primary_key)
 
       @aggregation_cache        = {}
       @association_cache        = {}