require a class for cache computations

2 files changed, 4 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
index 2317e34bc0..82bf426b22 100644
--- a/activerecord/lib/active_record/associations/preloader.rb
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -85,7 +85,7 @@ module ActiveRecord
       def initialize(records, associations, preload_scope = nil)
         @records       = Array.wrap(records).compact.uniq
         @associations  = Array.wrap(associations)
-        @preload_scope = preload_scope || Relation.create(nil, nil)
+        @preload_scope = preload_scope || Relation.new(nil, nil)
       end
 
       def run
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index 1d87b028ec..dd7d2582a0 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -81,7 +81,9 @@ module ActiveRecord
       # Cache the constants in @@subclasses because looking them up via const_get
       # make instantiation significantly slower.
       def relation_class_for(klass)
-        if klass && (klass_name = klass.name)
+        klass_name = klass.name
+
+        if klass_name
           my_cache = @@subclasses.compute_if_absent(self) { ThreadSafe::Cache.new }
           # This hash is keyed by klass.name to avoid memory leaks in development mode
           my_cache.compute_if_absent(klass_name) do