Merge pull request #41384 from eileencodes/fix-autoload-for-null-pool

Fix autoload for NullPool
rails · Feb 9, 2021 · 59b3d37 · 59b3d37
2 parents 9d34ed7 + 39ae527
commit 59b3d37
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/connection_adapters.rb b/activerecord/lib/active_record/connection_adapters.rb
@@ -30,12 +30,16 @@ module ConnectionAdapters
       autoload :DatabaseStatements
       autoload :DatabaseLimits
       autoload :Quoting
-      autoload :ConnectionPool
       autoload :ConnectionHandler
       autoload :QueryCache
       autoload :Savepoints
     end
 
+    autoload_at "active_record/connection_adapters/abstract/connection_pool" do
+      autoload :ConnectionPool
+      autoload :NullPool
+    end
+
     autoload_at "active_record/connection_adapters/abstract/transaction" do
       autoload :TransactionManager
       autoload :NullTransaction