database_cleaner-active_record 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e54fe3fd85573506fd946df28f0ba19101ca6d854317ea38596e42d7d3e2c8
-  data.tar.gz: 746f002f2a5b7fe97b39550db8d5ac945cc9e7d0ae46a04aafd2001eb214a226
+  metadata.gz: 1c30dde1a5104c77a1bf907b7d5d5bb8aa187776246b8b02639d0ea8e352fd1d
+  data.tar.gz: 982552da4f5c169ddf5a0d16c9703eb2b73623e1330c476dd8116683409951fd
 SHA512:
-  metadata.gz: e823f4e8874d3369dcbce8f3e626cacac42cca7270544a91afda9b8bda3927577c1c85e50d57bf3ec21bce8c7443c65a845c364e404c04a8b3983678cb2e3bfd
-  data.tar.gz: 538b0e24fc2ff9f1756defdac05ce7290e3c2d24bd42f3d6f59c0001364976a183b42fafba7c847c1113f31265889b79614ab00da4c793abcc12d85bea9d4070
+  metadata.gz: 9d46caf98521a0a53b67655e1eb55947108b13cf37b2ce8398fcdc53f34b334c51fa34acf65135c04689a1022394a396dc0648c0406d2d92a147c005bf488551
+  data.tar.gz: fd15224bc593acc67996d9a2c04840df1e95d3eafb49a68ba6d73dd64c0e92cd6984d9bb7b972ed7d6ef6063d67cd918ba1474630c8675520e932ef57c267108

data/Appraisals

@@ -1,16 +1,3 @@
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-end
-
-appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0"
-end
-
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.0"
-  gem "sqlite3", "~> 1.5"
-end
-
 appraise "rails-6.1" do
   gem "rails", "~> 6.1.0"
   gem "sqlite3", "~> 1.5"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Development (unreleased)
 
+## 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

data/README.md

@@ -63,6 +63,8 @@ DatabaseCleaner[:active_record].strategy = DatabaseCleaner::ActiveRecord::Deleti
 
 * `: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:

data/lib/database_cleaner/active_record/base.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 require 'database_cleaner/strategy'
 require 'erb'
 require 'yaml'

data/lib/database_cleaner/active_record/deletion.rb

@@ -1,6 +1,3 @@
-require 'active_record'
-require 'database_cleaner/active_record/truncation'
-
 module DatabaseCleaner
   module ActiveRecord
     class Deletion < Truncation

data/lib/database_cleaner/active_record/transaction.rb

@@ -1,5 +1,3 @@
-require 'database_cleaner/active_record/base'
-
 module DatabaseCleaner
   module ActiveRecord
     class Transaction < Base

data/lib/database_cleaner/active_record/truncation.rb

@@ -5,8 +5,8 @@ module DatabaseCleaner
   module ActiveRecord
     class Truncation < Base
       def initialize(opts={})
-        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :cache_tables, :reset_ids]).empty?
-          raise ArgumentError, "The only valid options are :only, :except, :pre_count, :reset_ids, 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
@@ -14,6 +14,7 @@ module DatabaseCleaner
 
         @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
 
@@ -22,7 +23,7 @@ module DatabaseCleaner
           if pre_count? && connection.respond_to?(:pre_count_truncate_tables)
             connection.pre_count_truncate_tables(tables_to_clean(connection))
           else
-            connection.truncate_tables(tables_to_clean(connection))
+            connection.truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           end
         end
       end
@@ -102,7 +103,7 @@ 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
@@ -152,7 +153,7 @@ module DatabaseCleaner
           end
         end
 
-        def truncate_tables(tables)
+        def truncate_tables(tables, opts)
           tables.each { |t| truncate_table(t) }
         end
 
@@ -193,9 +194,10 @@ 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)

data/lib/database_cleaner/active_record/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module ActiveRecord
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   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.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ernesto Tagwerker
 - Micah Geisel
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner-core
@@ -189,7 +188,6 @@ homepage: https://github.com/DatabaseCleaner/database_cleaner-active_record
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-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.