1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index e386cc0e4c..ee7b7c8bea 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -30,6 +30,13 @@ module ActiveRecord
         record
       end
 
+      # Implements the reload reader method, e.g. foo.reload_bar for
+      # Foo.has_one :bar
+      def force_reload_reader
+        klass.uncached { reload }
+        target
+      end
+
       private
 
         def create_scope
@@ -51,6 +58,8 @@ module ActiveRecord
           sc.execute(binds, klass, conn) do |record|
             set_inverse_instance record
           end.first
+        rescue ::RangeError
+          nil
         end
 
         def replace(record)