release_connection after cleaning

For Rails >= 7.2, this library gets a connection via
`#lease_connection`. But it never releases the connection. Release the
connection back to the pool after `#clean`-ing.

Rails >= 7.2 does connection health checks / reconnect on connection
checkout. If the connection is never checked back into the pool, it will
never get "repaired", which makes testing database connection issues
tricky.

Author: nerdrew

.github/workflows/ci.yml

@@ -9,14 +9,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.3', '3.2', '3.1']
-        rails: ['6.1', '7.0', '7.1', '7.2']
+        ruby: ['3.4', '3.3', '3.2', '3.1']
+        rails: ['6.1', '7.0', '7.1', '7.2', '8.0']
         channel: ['stable']
 
         include:
           - ruby: 'ruby-head'
             rails: 'edge'
             channel: 'experimental'
+          - ruby: 'ruby-head'
+            rails: '8.0'
+            channel: 'experimental'
           - ruby: 'ruby-head'
             rails: '7.2'
             channel: 'experimental'
@@ -35,14 +38,18 @@ jobs:
             channel: 'experimental'
 
         exclude:
-          - ruby: '3.3'
-            rails: '7.0' # TODO: works on 7-0-stable branch, remove after a 7.0.x patch release
+          - ruby: '3.4'
+            rails: '6.1'
+
           - ruby: '3.3'
             rails: '6.1'
 
           - ruby: '3.2'
             rails: '6.1'
 
+          - ruby: '3.1'
+            rails: '8.0'
+
     continue-on-error: ${{ matrix.channel != 'stable' }}
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps

database_cleaner-active_record.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "database_cleaner-core", "~>2.0.0"
+  spec.add_dependency "database_cleaner-core", "~> 2.1.0"
   spec.add_dependency "activerecord", ">= 5.a"
 
   spec.add_development_dependency "bundler"

gemfiles/rails_8.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "rails", "~> 8.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

lib/database_cleaner/active_record/deletion.rb

@@ -9,6 +9,8 @@ def clean
             delete_tables(connection, tables_to_clean(connection))
           end
         end
+
+        connection_class.connection_pool.release_connection
       end
 
       private

lib/database_cleaner/active_record/transaction.rb

@@ -22,6 +22,8 @@ def clean
             connection.rollback_transaction
           end
         end
+
+        connection_class.connection_pool.release_connection
       end
     end
   end

lib/database_cleaner/active_record/truncation.rb

@@ -26,6 +26,8 @@ def clean
             connection.truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           end
         end
+
+        connection_class.connection_pool.release_connection
       end
 
       private

spec/database_cleaner/active_record/truncation_spec.rb

@@ -106,7 +106,11 @@
           it "specifies cascade when truncating" do
             User.create!({name: 1})
 
-            expect(strategy.send(:connection)).to receive(:truncate_tables).with(['users', 'agents'], {truncate_option: :cascade})
+            if helper.db == :postgres
+              expect(strategy.send(:connection)).to receive(:truncate_tables).with(match_array(%w[users agents user_profiles]), {truncate_option: :cascade})
+            else
+              expect(strategy.send(:connection)).to receive(:truncate_tables).with(match_array(%w[users agents]), {truncate_option: :cascade})
+            end
             strategy.clean
           end
         end
@@ -117,7 +121,11 @@
           it "specifies restrict when truncating" do
             User.create!
 
-            expect(strategy.send(:connection)).to receive(:truncate_tables).with(['users', 'agents'], {truncate_option: :restrict})
+            if helper.db == :postgres
+              expect(strategy.send(:connection)).to receive(:truncate_tables).with(match_array(%w[users agents user_profiles]), {truncate_option: :restrict})
+            else
+              expect(strategy.send(:connection)).to receive(:truncate_tables).with(match_array(%w[users agents]), {truncate_option: :restrict})
+            end
             strategy.clean
           end
         end

spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require "bundler/setup"
 
+require "logger" # Fix for Rails 7.0 tests
+
 if ENV['COVERAGE'] == 'true'
   require "simplecov"