1 files changed, 13 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 06a414b874..62d48d3a2c 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -13,6 +13,19 @@ module ActiveRecord::Associations::Builder
 
     private
 
+      def define_readers
+        super
+        name = self.name
+
+        model.redefine_method("#{name}_loaded?") do
+          ActiveSupport::Deprecation.warn(
+            "Calling obj.#{name}_loaded? is deprecated. Please use " \
+            "obj.association(:#{name}).loaded? instead."
+          )
+          association(name).loaded?
+        end
+      end
+
       def define_constructors
         name = self.name