database_cleaner-active_record 2.0.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f4e22827466f77ef287a8cfa7cf75078940f69f4e3b222676d7cb30d74edb74
-  data.tar.gz: 942936724f8ef0e4a0107044aef35b203e6e8d23c1a6d241d452342eb1d8ae17
+  metadata.gz: f4009a9e2733cc775473d2357dedf4005e14abc0be5a1b2841241dc9ac0a8afd
+  data.tar.gz: 89a9750d057f21fb543f2f7ca93926c48df4e2b08fec1276589063ca42254146
 SHA512:
-  metadata.gz: 8116e18c0f97636ab92457c6025ef7978547aba2553c747e8120b7ac528fe583f6f1cc76cbc78385c2a26fa6a6a348d37c95c5440186404259a4d50b39200b9d
-  data.tar.gz: e847363c1be911931358c9b1cb3f09717e302b2e89aa609ce366baa1ec6664fbf3935b4c52b6785cfac25f36794992a118edc9846774a485e26fa7aeaa27896e
+  metadata.gz: 0daef1af314e3a7f432257e7b6051076d7963e685861b5b232811bcb9bcc6cdf0d9a020b980536ca9533c804c0aebe258dbaf6ef642a96c56950be6faf50ce3a
+  data.tar.gz: 3166ab8f41926b33a005f458ad601de7f2cc0fff3c2a36151a5c217271fe3dd84a7db332c448ece8aafab396d5e730c3b4760acfc5b56edd6129201e12977f86

data/.github/workflows/ci.yml

@@ -0,0 +1,94 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: 'Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }}, Channel: ${{ matrix.channel }}'
+    runs-on: 'ubuntu-22.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        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.4'
+            rails: 'edge'
+            channel: 'experimental'
+          - ruby: '3.3'
+            rails: 'edge'
+            channel: 'experimental'
+          - ruby: '3.2'
+            rails: 'edge'
+            channel: 'experimental'
+
+        exclude:
+          - 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
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # 'bundle install' and cache
+          rubygems: ${{ matrix.ruby == '2.5' && 'default' || 'latest' }}
+      - name: Copy config file
+        run: cp spec/support/sample.config.yml spec/support/config.yml
+      - name: Run tests
+        run: bundle exec rake
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+            MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        ports:
+            - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+

data/Appraisals

@@ -1,15 +1,22 @@
-appraise "rails-5.1" do
-  gem "rails", "~>5.1.0"
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
+  gem "sqlite3", "~> 1.5"
 end
 
-appraise "rails-5.2" do
-  gem "rails", "~>5.2.0"
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0.0"
+  gem "sqlite3", "~> 1.7"
 end
 
-appraise "rails-6.0" do
-  gem "rails", "~>6.0.0"
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
+  gem "sqlite3", "~> 1.7" # FIXME: remove after rails/rails#51592
 end
 
-appraise "rails-6.1" do
-  gem "rails", "~>6.1.0"
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0.beta2"
+end
+
+appraise "rails-edge" do
+  gem "rails", github: "rails/rails"
 end

data/CHANGELOG.md

@@ -0,0 +1,38 @@
+# Development (unreleased)
+
+## v2.2.2 2025-07-30
+
+* 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
+* https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/121 by @etagwerker
+* Fix order of arguments in `truncate_tables` expectation https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/124
+* Add Docker to make it easier to run tests locally for maintainers and contributors https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/109
+* Allow truncation option https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/121 by @etagwerker
+
+## v2.2.1 2025-05-13
+
+* https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/111 by @tagliala
+* https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/104 by @fatkodima
+* https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/118 by @pat, @thegeorgeous, and @nnishimura
+
+## v2.2.0 2024-07-12
+
+* Fix "ERROR:  currval of sequence" in Postgres adapter: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/103
+* Use lock synchronize on transaction callback: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/73
+* Stop testing with EOLed Ruby & Rails versions: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/105
+* Fix compatibility issue with Rails 7.2: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/107
+* Fix typo in truncation methods: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/94/files
+* Address deprecation of ActiveRecord::Base.connection in Rails 7.2: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/102
+* Support Rails 7.2+: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/101
+* Fix reset_ids test with Trilogy adapter: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/93
+* Implement resetting ids for deletion strategy: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/71
+* Avoid loading ActiveRecord::Base early: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/91
+* Fix specs to account for trilogy: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/88
+* Add basic support for trilogy: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/85
+
+## v2.1.0 2023-02-17
+
+* Add Ruby 3.2 to CI matrix: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/79
+* Add Rails 7.1 support: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/78
+* Add WHERE clause to make `ruby-spanner-activerecord` happy: https://github.com/DatabaseCleaner/database_cleaner-active_record/pull/77

data/CONTRIBUTE.md

@@ -0,0 +1,45 @@
+# Guidelines for contributing
+
+## 1. Fork & Clone
+
+Since you probably don't have rights to the main repo, you should Fork it (big
+button up top). After that, clone your fork locally and optionally add an
+upstream:
+
+    git remote add upstream git@github.com:DatabaseCleaner/database_cleaner-active_record.git
+
+## 2. Make sure the tests run fine
+
+The gem uses Appraisal to configure different Gemfiles to test different Rails versions.
+
+### Run tests without Docker (or using Docker only for the databases)
+
+- You can run all the databases through docker if needed with `docker compose -f docker-compose.db.yml up` (you can also have them running on your system, just comment out the ones you don't need from the `docker-compose.db.yml` file)
+- Copy `spec/support/sample.config.yml` to `spec/support/config.yml` and edit it as needed
+- `BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle install` (change `6.1` with any version from the `gemfiles` directory)
+- `BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle exec rake`
+
+Note that if you don't have all the supported databases installed and running,
+some tests will fail.
+
+> Check the `.github/workflows/ci.yml` file for different combinations of Ruby and Rails that are expected to work
+
+### Run tests with Docker
+
+- Open `docker-compose.yml` and configure the Ruby version and Gemfile file to use
+- Copy `spec/support/sample.docker.config.yml` to `spec/support/config.yml` (not this config file is specific for the Docker setup)
+- Run `docker compose up` to start the container, run the tests, and exit
+- Run `docker compose run ruby bash` to open `bash` inside the container for more control, run `rake` to run the tests
+
+> Note that the code is mounted inside the docker container, so changes in the container will reflect in the code. There's no need to re-build the container for code changes, but changing the Ruby version or Gemfile in the docker-compose.yml will require a container re-build with `docker compose build --no-cache`
+
+> Check the `.github/workflows/ci.yml` file for different combinations of Ruby and Rails that are expected to work
+
+## 3. Prepare your contribution
+
+This is all up to you but a few points should be kept in mind:
+
+- Please write tests for your contribution
+- Make sure that previous tests still pass
+- Push it to a branch of your fork
+- Submit a pull request

data/Dockerfile

@@ -0,0 +1,19 @@
+ARG RUBY_VERSION=3.3
+FROM ruby:${RUBY_VERSION}
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the current directory contents into the container at /app
+# This is copied so we can bundle the application, but it's replaced
+# by a mounted volume with the current code when executed with docker compose
+COPY . /app
+
+ARG BUNDLE_GEMFILE=Gemfile
+ENV BUNDLE_GEMFILE=${BUNDLE_GEMFILE}
+
+# Install any needed packages specified in Gemfile
+RUN ./bin/setup
+
+# Command to run the application
+CMD ["bash"]

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
 
 gem "rails", "~>5.2"
-gem "byebug"
 
 group :test do
   gem "simplecov", require: false

data/README.md

@@ -1,6 +1,6 @@
 # Database Cleaner Adapter for ActiveRecord
 
-[![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner-active_record.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner-active_record)
+[![Tests](https://github.com/DatabaseCleaner/database_cleaner-active_record/actions/workflows/ci.yml/badge.svg)](https://github.com/DatabaseCleaner/database_cleaner-active_record/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-active_record/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-active_record)
 [![codecov](https://codecov.io/gh/DatabaseCleaner/database_cleaner-active_record/branch/master/graph/badge.svg)](https://codecov.io/gh/DatabaseCleaner/database_cleaner-active_record)
 
@@ -8,7 +8,7 @@ Clean your ActiveRecord databases with Database Cleaner.
 
 See https://github.com/DatabaseCleaner/database_cleaner for more information.
 
-For support or to discuss development please use the [Google Group](https://groups.google.com/group/database_cleaner).
+For support or to discuss development please use GitHub Issues.
 
 ## Installation
 
@@ -51,16 +51,20 @@ The truncation and deletion strategies may accept the following options:
 
 ```ruby
 # Only truncate the "users" table.
-DatabaseCleaner[:active_record].strategy = :truncation, only: ["users"]
+DatabaseCleaner[:active_record].strategy = DatabaseCleaner::ActiveRecord::Truncation.new(only: ["users"])
 
 # Delete all tables except the "users" table.
-DatabaseCleaner[:active_record].strategy = :deletion, except: ["users"]
+DatabaseCleaner[:active_record].strategy = DatabaseCleaner::ActiveRecord::Deletion.new(except: ["users"])
 ```
 
 * `:pre_count` - When set to `true` this will check each table for existing rows before truncating or deleting it.  This can speed up test suites when many of the tables are never populated. Defaults to `false`. (Also, see the section on [What strategy is fastest?](#what-strategy-is-fastest))
 
 * `:cache_tables` - When set to `true` the list of tables to truncate or delete from will only be read from the DB once, otherwise it will be read before each cleanup run. Set this to `false` if (1) you create and drop tables in your tests, or (2) you change Postgres schemas (`ActiveRecord::Base.connection.schema_search_path`) in your tests (for example, in a multitenancy setup with each tenant in a different Postgres schema). Defaults to `true`.
 
+* `:reset_ids` - Only valid for deletion strategy, when set to `true` resets ids to 1 after each table is cleaned.
+
+* `:truncate_option` - Only valid for PostgreSQL. Acceptable values are `:restrict` and `:cascade`. Default is `:restrict`
+
 ## Adapter configuration options
 
 `#db` defaults to the default ActiveRecord database, but can be specified manually in a few ways:
@@ -95,9 +99,13 @@ You can also add this parameter to your database.yml file:
 test:
   adapter: postgresql
   # ...
-  min_messages: WARNING  
+  min_messages: WARNING
 </pre>
 
+## Development
+
+Check the CONTRIBUTE.md file for instructions running tests with and withour Docker.
+
 ## COPYRIGHT
 
 See [LICENSE](LICENSE) for details.

data/database_cleaner-active_record.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "database_cleaner-core", "~>2.0.0"
+  spec.add_dependency "database_cleaner-core", "~>2.0"
   spec.add_dependency "activerecord", ">= 5.a"
 
   spec.add_development_dependency "bundler"
@@ -28,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "trilogy"
+
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
 end

data/docker-compose.db.yml

@@ -0,0 +1,19 @@
+services:
+  postgres:
+    image: postgres:16 # specify the version needed for a given app
+    environment:
+      - POSTGRES_PASSWORD=postgres # this is required
+    ports:
+      - "127.0.0.1:5432:5432" # so we can use `localhost` as the host
+  mysql:
+    image: mysql:5.7
+    environment:
+      - MYSQL_ROOT_PASSWORD=mysql
+    ports:
+      - "127.0.0.1:3306:3306"
+  redis:
+    image: redis:6.2-alpine
+    restart: always
+    ports:
+      - "127.0.0.1:6379:6379"
+    command: redis-server --save 20 1 --loglevel warning

data/docker-compose.yml

@@ -0,0 +1,26 @@
+services:
+  postgres:
+    image: postgres:16 # specify the version needed for a given app
+    environment:
+      - POSTGRES_PASSWORD=postgres # this is required
+  mysql:
+    image: mysql:5.7
+    environment:
+      - MYSQL_ROOT_PASSWORD=mysql
+  redis:
+    image: redis:6.2-alpine
+    restart: always
+    command: redis-server --save 20 1 --loglevel warning
+  ruby:
+    build:
+      context: .
+      args:
+        BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile # Manually change this based on the desired Rails version
+        RUBY_VERSION: 3.3 # Manually change this based on the desired Ruby version
+    volumes:
+      - ".:/app:delegated"
+    command: rake
+    depends_on:
+      - mysql
+      - postgres
+      - redis

data/gemfiles/rails_6.1.gemfile

@@ -3,8 +3,12 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>6.1.0"
-gem "byebug"
+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

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+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
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+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
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/{rails_5.2.gemfile → rails_7.2.gemfile}

@@ -3,8 +3,10 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>5.2.0"
-gem "byebug"
+gem "rails", "~> 7.2.0"
+gem "logger"
+gem "mutex_m"
+gem "bigdecimal"
 
 group :test do
   gem "simplecov", require: false

data/gemfiles/{rails_5.1.gemfile → rails_8.0.gemfile}

@@ -3,8 +3,10 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>5.1.0"
-gem "byebug"
+gem "rails", "~> 8.0"
+gem "logger"
+gem "mutex_m"
+gem "bigdecimal"
 
 group :test do
   gem "simplecov", require: false

data/gemfiles/{rails_6.0.gemfile → rails_edge.gemfile}

@@ -3,8 +3,10 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>6.0.0"
-gem "byebug"
+gem "rails", github: "rails/rails"
+gem "logger"
+gem "mutex_m"
+gem "bigdecimal"
 
 group :test do
   gem "simplecov", require: false

data/lib/database_cleaner/active_record/base.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 require 'database_cleaner/strategy'
 require 'erb'
 require 'yaml'
@@ -15,7 +14,13 @@ module DatabaseCleaner
 
     class Base < DatabaseCleaner::Strategy
       def self.migration_table_name
-        ::ActiveRecord::SchemaMigration.table_name
+        if ::ActiveRecord::Base.connection_pool.respond_to?(:schema_migration) # Rails >= 7.2
+          ::ActiveRecord::Base.connection_pool.schema_migration.table_name
+        elsif ::ActiveRecord::Base.connection.respond_to?(:schema_migration) # Rails >= 6.0
+          ::ActiveRecord::Base.connection.schema_migration.table_name
+        else
+          ::ActiveRecord::SchemaMigration.table_name
+        end
       end
 
       def self.exclusion_condition(column_name)
@@ -46,7 +51,12 @@ module DatabaseCleaner
 
       def load_config
         if db != :default && db.is_a?(Symbol) && File.file?(DatabaseCleaner::ActiveRecord.config_file_location)
-          connection_details = YAML::load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result)
+          connection_details =
+            if RUBY_VERSION.match?(/\A2\.5/)
+              YAML.safe_load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result, [], [], true)
+            else
+              YAML.safe_load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result, aliases: true)
+            end
           @connection_hash   = valid_config(connection_details, db.to_s)
         end
       end

data/lib/database_cleaner/active_record/deletion.rb

@@ -1,17 +1,16 @@
-require 'active_record'
-require 'database_cleaner/active_record/truncation'
-
 module DatabaseCleaner
   module ActiveRecord
     class Deletion < Truncation
       def clean
         connection.disable_referential_integrity do
           if pre_count? && connection.respond_to?(:pre_count_tables)
-            delete_tables(connection, connection.pre_count_tables(tables_to_truncate(connection)))
+            delete_tables(connection, connection.pre_count_tables(tables_to_clean(connection)))
           else
-            delete_tables(connection, tables_to_truncate(connection))
+            delete_tables(connection, tables_to_clean(connection))
           end
         end
+
+        connection_class.connection_pool.release_connection
       end
 
       private
@@ -19,14 +18,28 @@ module DatabaseCleaner
       def delete_tables(connection, table_names)
         table_names.each do |table_name|
           delete_table(connection, table_name)
+          reset_id_sequence(connection, table_name) if @reset_ids
         end
       end
 
       def delete_table connection, table_name
-        connection.execute("DELETE FROM #{connection.quote_table_name(table_name)}")
+        connection.execute("DELETE FROM #{connection.quote_table_name(table_name)} WHERE 1=1")
+      end
+
+      def reset_id_sequence connection, table_name
+        case connection.adapter_name
+        when 'Mysql2', 'Trilogy'
+          connection.execute("ALTER TABLE #{table_name} AUTO_INCREMENT = 1;")
+        when 'SQLite'
+          connection.execute("delete from sqlite_sequence where name='#{table_name}';")
+        when 'PostgreSQL'
+          connection.reset_pk_sequence!(table_name)
+        else
+          raise "reset_id option not supported for #{connection.adapter_name}"
+        end
       end
 
-      def tables_to_truncate(connection)
+      def tables_to_clean(connection)
         if information_schema_exists?(connection)
           @except += connection.database_cleaner_view_cache + migration_storage_names
           (@only.any? ? @only : tables_with_new_rows(connection)) - @except
@@ -64,7 +77,7 @@ module DatabaseCleaner
       end
 
       def information_schema_exists? connection
-        connection.adapter_name == "Mysql2"
+        ["Mysql2", "Trilogy"].include?(connection.adapter_name)
       end
     end
   end

data/lib/database_cleaner/active_record/transaction.rb

@@ -1,21 +1,29 @@
-require 'database_cleaner/active_record/base'
-
 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
 
 
       def clean
         connection_class.connection_pool.connections.each do |connection|
-          next unless connection.open_transactions > 0
-          connection.rollback_transaction
+          connection.lock.synchronize do
+            next unless connection.open_transactions > 0
+            connection.rollback_transaction
+          end
         end
+
+        connection_class.connection_pool.release_connection
       end
     end
   end

data/lib/database_cleaner/active_record/truncation.rb

@@ -1,39 +1,48 @@
 require "delegate"
-require 'active_record/base'
 require 'database_cleaner/active_record/base'
 
 module DatabaseCleaner
   module ActiveRecord
     class Truncation < Base
       def initialize(opts={})
-        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :cache_tables]).empty?
-          raise ArgumentError, "The only valid options are :only, :except, :pre_count, and :cache_tables. You specified #{opts.keys.join(',')}."
+        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :cache_tables, :reset_ids, :truncate_option]).empty?
+          raise ArgumentError, "The only valid options are :only, :except, :pre_count, :reset_ids, :cache_tables and :truncate_option. You specified #{opts.keys.join(',')}."
         end
 
         @only = Array(opts[:only]).dup
         @except = Array(opts[:except]).dup
 
+        @reset_ids = opts[:reset_ids]
         @pre_count = opts[:pre_count]
+        @truncate_option = opts[:truncate_option] || :restrict
         @cache_tables = opts.has_key?(:cache_tables) ? !!opts[:cache_tables] : true
       end
 
       def clean
         connection.disable_referential_integrity do
           if pre_count? && connection.respond_to?(:pre_count_truncate_tables)
-            connection.pre_count_truncate_tables(tables_to_truncate(connection))
+            connection.pre_count_truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           else
-            connection.truncate_tables(tables_to_truncate(connection))
+            connection.truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           end
         end
+
+        connection_class.connection_pool.release_connection
       end
 
       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)
+      def tables_to_clean(connection)
         if @only.none?
           all_tables = cache_tables? ? connection.database_cleaner_table_cache : connection.database_tables
           @only = all_tables.map { |table| table.split(".").last }
@@ -62,7 +71,7 @@ module DatabaseCleaner
       def initialize(connection)
         extend AbstractAdapter
         case connection.adapter_name
-        when "Mysql2"
+        when "Mysql2", "Trilogy"
           extend AbstractMysqlAdapter
         when "SQLite"
           extend AbstractMysqlAdapter
@@ -96,14 +105,14 @@ module DatabaseCleaner
           execute("DELETE FROM #{quote_table_name(table_name)}")
         end
 
-        def truncate_tables(tables)
+        def truncate_tables(tables, opts)
           tables.each { |t| truncate_table(t) }
         end
       end
 
       module AbstractMysqlAdapter
-        def pre_count_truncate_tables(tables)
-          truncate_tables(pre_count_tables(tables))
+        def pre_count_truncate_tables(tables, opts = {})
+          truncate_tables(pre_count_tables(tables), opts)
         end
 
         def pre_count_tables(tables)
@@ -146,12 +155,12 @@ module DatabaseCleaner
           end
         end
 
-        def truncate_tables(tables)
+        def truncate_tables(tables, opts)
           tables.each { |t| truncate_table(t) }
         end
 
-        def pre_count_truncate_tables(tables)
-          truncate_tables(pre_count_tables(tables))
+        def pre_count_truncate_tables(tables, opts = {})
+          truncate_tables(pre_count_tables(tables), opts)
         end
 
         def pre_count_tables(tables)
@@ -187,13 +196,14 @@ module DatabaseCleaner
           tables_with_schema
         end
 
-        def truncate_tables(table_names)
+        def truncate_tables(table_names, opts)
           return if table_names.nil? || table_names.empty?
-          execute("TRUNCATE TABLE #{table_names.map{|name| quote_table_name(name)}.join(', ')} RESTART IDENTITY RESTRICT;")
+
+          execute("TRUNCATE TABLE #{table_names.map{|name| quote_table_name(name)}.join(', ')} RESTART IDENTITY #{opts[:truncate_option]};")
         end
 
-        def pre_count_truncate_tables(tables)
-          truncate_tables(pre_count_tables(tables))
+        def pre_count_truncate_tables(tables, opts = {})
+          truncate_tables(pre_count_tables(tables), opts)
         end
 
         def pre_count_tables(tables)
@@ -218,7 +228,7 @@ module DatabaseCleaner
         def has_been_used?(table)
           return has_rows?(table) unless has_sequence?(table)
 
-          cur_val = select_value("SELECT currval('#{table}_id_seq');").to_i rescue 0
+          cur_val = select_value("SELECT last_value from #{table}_id_seq;").to_i
           cur_val > 0
         end
 
@@ -246,4 +256,3 @@ module DatabaseCleaner
     private_constant :ConnectionWrapper
   end
 end
-

data/lib/database_cleaner/active_record/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module ActiveRecord
-    VERSION = "2.0.1"
+    VERSION = "2.2.2"
   end
 end

data/lib/database_cleaner/active_record.rb

@@ -1,7 +1,11 @@
-require 'database_cleaner/active_record/version'
+require 'active_record'
 require 'database_cleaner/core'
-require 'database_cleaner/active_record/transaction'
-require 'database_cleaner/active_record/truncation'
-require 'database_cleaner/active_record/deletion'
 
-DatabaseCleaner[:active_record].strategy = :transaction
+ActiveSupport.on_load(:active_record) do
+  require 'database_cleaner/active_record/base'
+  require 'database_cleaner/active_record/transaction'
+  require 'database_cleaner/active_record/truncation'
+  require 'database_cleaner/active_record/deletion'
+
+  DatabaseCleaner[:active_record].strategy = :transaction
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Ernesto Tagwerker
 - Micah Geisel
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2025-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner-core
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trilogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Strategies for cleaning databases using ActiveRecord. Can be used to
   ensure a clean state for testing.
 email:
@@ -145,10 +158,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
+- CONTRIBUTE.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,11 +172,15 @@ files:
 - bin/console
 - bin/setup
 - database_cleaner-active_record.gemspec
+- docker-compose.db.yml
+- docker-compose.yml
 - gemfiles/.bundle/config
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/database_cleaner-active_record.rb
 - lib/database_cleaner/active_record.rb
 - lib/database_cleaner/active_record/base.rb
@@ -172,8 +192,8 @@ files:
 homepage: https://github.com/DatabaseCleaner/database_cleaner-active_record
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/DatabaseCleaner/database_cleaner-active_record/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -188,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Strategies for cleaning databases using ActiveRecord. Can be used to ensure
   a clean state for testing.

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-services:
-  - mysql
-  - postgresql
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-gemfile:
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_6.1.gemfile
-jobs:
-  exclude: # Unsupported combos: https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-  - rvm: 3.0
-    gemfiles/rails_5.1.gemfile
-  - rvm: 3.0
-    gemfiles/rails_5.2.gemfile
-
-before_install:
-  - bin/setup
-cache:
-  bundler: true