Fixes Issue #120 (#121)

* Fixes #120

* Add a reference to #121

* Patch test expectation

* [Feature][DX] Add Docker Configuration for Development (#109)

* Fixes #120

* Add docker configuration for development

This makes it easier to run the test suite in your local dev environment

* Add a development section for contributors

This should make it easier for people to set up the library and run the test suite within Docker

* Added ruby service to make it easier to get started with your contribution

* Update password to match Docker configuration

* Removed outdated docker-compose file

* Use older mysql to avoid trilogy error, fix docker compose and instructions, mount code for easier development

* Update readme to point to CONTRIBUTE.md file

* Run ./bin/setup so that we have the config file in place for tests

* Relax dependency

* Add a line about the Docker + DX change

---------

Co-authored-by: Ariel Juodziukynas <arieljuod@gmail.com>

* release_connection after cleaning (#122)

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.

* Add a reference to #121

* Change expectation to allow for a cascade option

---------

Co-authored-by: Ariel Juodziukynas <arieljuod@gmail.com>
Co-authored-by: Andrew Lazarus <nerdrew@gmail.com>

Author: 3 people

CHANGELOG.md

@@ -3,8 +3,10 @@
 * 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
 

lib/database_cleaner/active_record/truncation.rb

@@ -21,7 +21,7 @@ def initialize(opts={})
       def clean
         connection.disable_referential_integrity do
           if pre_count? && connection.respond_to?(:pre_count_truncate_tables)
-            connection.pre_count_truncate_tables(tables_to_clean(connection))
+            connection.pre_count_truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           else
             connection.truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           end
@@ -111,8 +111,8 @@ def truncate_tables(tables, opts)
       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)
@@ -159,8 +159,8 @@ 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)
@@ -202,8 +202,8 @@ def truncate_tables(table_names, opts)
           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)

spec/database_cleaner/active_record/truncation_spec.rb

@@ -95,7 +95,7 @@
           it "only truncates non-empty tables" do
             User.create!
 
-            expect(strategy.send(:connection)).to receive(:truncate_tables).with(['users'])
+            expect(strategy.send(:connection)).to receive(:truncate_tables).with(['users'], {:truncate_option=>:restrict})
             strategy.clean
           end
         end