Address deprecation of ActiveRecord::Base.connection in Rails 7.2 (#…

…102)
DatabaseCleaner · Jun 5, 2024 · 79b0876 · 79b0876
1 parent 74a913a
commit 79b0876
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/lib/database_cleaner/active_record/transaction.rb b/lib/database_cleaner/active_record/transaction.rb
@@ -4,10 +4,16 @@ module DatabaseCleaner
   module ActiveRecord
     class Transaction < Base
       def start
+        connection = if ::ActiveRecord.version >= Gem::Version.new("7.2")
+          connection_class.lease_connection
+        else
+          connection_class.connection
+        end
+
         # Hack to make sure that the connection is properly set up before cleaning
-        connection_class.connection.transaction {}
+        connection.transaction {}
 
-        connection_class.connection.begin_transaction joinable: false
+        connection.begin_transaction joinable: false
       end
 
 

diff --git a/lib/database_cleaner/active_record/truncation.rb b/lib/database_cleaner/active_record/truncation.rb
@@ -30,7 +30,13 @@ def clean
       private
 
       def connection
-        @connection ||= ConnectionWrapper.new(connection_class.connection)
+        @connection ||= ConnectionWrapper.new(
+          if ::ActiveRecord.version >= Gem::Version.new("7.2")
+            connection_class.lease_connection
+          else
+            connection_class.connection
+          end
+        )
       end
 
       def tables_to_truncate(connection)
@@ -246,4 +252,3 @@ def tables_with_schema
     private_constant :ConnectionWrapper
   end
 end
-