Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,47 @@ 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'
- ruby: 'ruby-head'
rails: '7.1'
channel: 'experimental'

- ruby: '3.3'
- ruby: '3.4'
rails: 'edge'
channel: 'experimental'
- ruby: '3.2'
- ruby: '3.3'
rails: 'edge'
channel: 'experimental'
- ruby: '3.1'
- ruby: '3.2'
rails: 'edge'
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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Development (unreleased)

* Release database connections after cleaning: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/122
* Provide a 'Changelog' link on Rubygems: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/114
* Fix bundling and CONTRIBUTE.md instructions: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/123
* Fix order of arguments in `truncate_tables` expectation https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/124
Expand Down
3 changes: 3 additions & 0 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_c
gem "rails", "~> 6.1.0"
gem "sqlite3", "~> 1.5"
gem "concurrent-ruby", "1.3.4"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
Expand Down
3 changes: 3 additions & 0 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_c
gem "rails", "~> 7.0.0"
gem "sqlite3", "~> 1.7"
gem "concurrent-ruby", "1.3.4"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
Expand Down
3 changes: 3 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ source "https://rubygems.org"
gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.7"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
Expand Down
3 changes: 3 additions & 0 deletions gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ source "https://rubygems.org"

gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
gem "rails", "~> 7.2.0"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
Expand Down
16 changes: 16 additions & 0 deletions gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 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"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
gem "codecov", require: false
end

gemspec path: "../"
3 changes: 3 additions & 0 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ source "https://rubygems.org"

gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
gem "rails", github: "rails/rails"
gem "logger"
gem "mutex_m"
gem "bigdecimal"

group :test do
gem "simplecov", require: false
Expand Down
2 changes: 2 additions & 0 deletions lib/database_cleaner/active_record/deletion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ def clean
delete_tables(connection, tables_to_clean(connection))
end
end

connection_class.connection_pool.release_connection
end

private
Expand Down
2 changes: 2 additions & 0 deletions lib/database_cleaner/active_record/transaction.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ def clean
connection.rollback_transaction
end
end

connection_class.connection_pool.release_connection
end
end
end
Expand Down
2 changes: 2 additions & 0 deletions lib/database_cleaner/active_record/truncation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require "bundler/setup"

require "logger" # Fix for Rails 7.0 tests

if ENV['COVERAGE'] == 'true'
require "simplecov"

Expand Down