database_rewinder 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33fb09096b416644a0a992422fd4bd0b1f8b8957d447f96e6c825f61d0c1246a
-  data.tar.gz: 7f01e681757326b0ef190d046bc9620151b18736036b4529ccafbc57b261f2dd
+  metadata.gz: 395cf45a9155494fbaa28f887a793d3780c6c4dea757e53d9c9057ddec96baca
+  data.tar.gz: 68088ac4f44554359f87e946db585812301557287c5f3b63b88c1c45b29f865d
 SHA512:
-  metadata.gz: bc22e635b796d03d57828b0bfae32ad0c611f1596cf2a945f91408285149b8ab151469ce696c4b359a592861611e7731e5bbad21f95b36b7ff0af074be4a4cee
-  data.tar.gz: b4f10e3069e8141bab9537a85ac48bfadf93b5cc029bfddfe35f9ce0c60c045a131c205a7587ca0e7fae19d1ccbc8912c4bdceeda1ab0bae6011d29572ada129
+  metadata.gz: 80e0acaed09f0606b8ae715e072c9d9198c97fcd07cedbda94c1442ef256970e89da10a983935724440fb98362210bf986f800051b79223c828061828e563b68
+  data.tar.gz: d0c1275d8ee0a691271a5569c499f1c23c98167089935161b798090d84b1136039ca4c7d9b34186688d48671c821b18a754614c3fc2683b93907ffdf92bbdd4d

data/.github/workflows/main.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     services:
       postgres:
-        image: postgres:10
+        image: postgres:12
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -27,30 +27,51 @@ jobs:
 
       matrix:
         db: [sqlite3, postgresql, mysql]
-        ruby_version: [ruby-head, '3.0', '2.7', '2.6']
-        rails_version: [edge, '7.0', '6.1', '6.0', '5.2']
+        ruby_version: [ruby-head, '3.2', '3.1', '3.0', '2.7', '2.6']
+        rails_version: [edge, '7.1', '7.0', '6.1']
 
         exclude:
           - ruby_version: '2.6'
             rails_version: edge
 
+          - ruby_version: '2.6'
+            rails_version: '7.1'
+
           - ruby_version: '2.6'
             rails_version: '7.0'
 
           - ruby_version: ruby-head
             rails_version: '6.1'
 
-          - ruby_version: ruby-head
+        include:
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+            db: sqlite3
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+            db: postgresql
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+            db: mysql
+          - ruby_version: '2.6'
+            rails_version: '6.0'
+            db: sqlite3
+          - ruby_version: '2.6'
             rails_version: '6.0'
-          - ruby_version: '3.0'
+            db: postgresql
+          - ruby_version: '2.6'
             rails_version: '6.0'
+            db: mysql
 
-          - ruby_version: ruby-head
+          - ruby_version: '2.7'
             rails_version: '5.2'
-          - ruby_version: '3.0'
+            db: sqlite3
+          - ruby_version: '2.7'
             rails_version: '5.2'
-
-        include:
+            db: postgresql
+          - ruby_version: '2.7'
+            rails_version: '5.2'
+            db: mysql
           - ruby_version: '2.4'
             rails_version: '5.2'
             db: sqlite3
@@ -91,18 +112,19 @@ jobs:
             rails_version: '4.2'
             db: mysql
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       DB: ${{ matrix.db }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
+          rubygems: ${{ matrix.ruby_version < '2.6' && 'default' || 'latest' }}
           bundler: ${{ startsWith(matrix.rails_version, '4.') && '1' || 'latest' }}
           bundler-cache: true
         continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.allow_failures == 'true') }}

data/Gemfile

@@ -14,6 +14,7 @@ else
 end
 
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gem 'loofah', RUBY_VERSION < '2.5' ? '< 2.21.0' : '>= 0'
 gem 'selenium-webdriver'
 
 rails_version = ENV['RAILS_VERSION'] || '∞'

data/README.md

@@ -23,9 +23,9 @@ This strategy was originally devised and implemented by Shingo Morita (@eudoxa)
 
 ## Supported versions
 
-* ActiveRecord 4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0 (edge)
+* ActiveRecord 4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 7.2 (edge)
 
-* Ruby 2.4, 2.5, 2.6, 2.7, 3.0, 3.1 (trunk)
+* Ruby 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3 (trunk)
 
 ## Installation
 

data/database_rewinder.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.9.8'
+  spec.version       = '0.9.9'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner for Active Record"

data/lib/database_rewinder/active_record_monkey.rb

@@ -2,57 +2,27 @@
 
 module DatabaseRewinder
   module InsertRecorder
-    module Execute
-      module NoKwargs
-        def execute(sql, *)
-          DatabaseRewinder.record_inserted_table self, sql
-          super
-        end
-      end
-
-      module WithKwargs
-        def execute(sql, *, **)
-          DatabaseRewinder.record_inserted_table self, sql
-          super
-        end
-
-        def raw_execute(sql, *, **)
-          DatabaseRewinder.record_inserted_table self, sql
-          super
-        end
-      end
-    end
-
-    module ExecQuery
-      module NoKwargs
-        def exec_query(sql, *)
-          DatabaseRewinder.record_inserted_table self, sql
-          super
-        end
-      end
-
-      module WithKwargs
-        def exec_query(sql, *, **)
-          DatabaseRewinder.record_inserted_table self, sql
-          super
-        end
-      end
-    end
-
     # This method actually no longer has to be a `prepended` hook because InsertRecorder is a module without a direct method now, but still doing this just for compatibility
     def self.prepended(mod)
-      if meth = mod.instance_method(:execute)
-        if meth.parameters.any? {|type, _name| [:key, :keyreq, :keyrest].include? type }
-          mod.send :prepend, Execute::WithKwargs
-        else
-          mod.send :prepend, Execute::NoKwargs
-        end
-      end
-      if meth = mod.instance_method(:exec_query)
-        if meth.parameters.any? {|type, _name| [:key, :keyreq, :keyrest].include? type }
-          mod.send :prepend, ExecQuery::WithKwargs
-        else
-          mod.send :prepend, ExecQuery::NoKwargs
+      [:execute, :exec_query, :internal_exec_query].each do |method_name|
+        if mod.instance_methods.include?(method_name) && (meth = mod.instance_method(method_name))
+          method_body = if meth.parameters.any? {|type, _name| [:key, :keyreq, :keyrest].include? type }
+            <<-RUBY
+              def #{method_name}(sql, *, **)
+                DatabaseRewinder.record_inserted_table self, sql
+                super
+              end
+            RUBY
+          else
+            <<-RUBY
+              def #{method_name}(sql, *)
+                DatabaseRewinder.record_inserted_table self, sql
+                super
+              end
+            RUBY
+          end
+
+          mod.send :prepend, Module.new { class_eval method_body }
         end
       end
     end
@@ -62,7 +32,9 @@ end
 
 # Already loaded adapters (SQLite3Adapter, PostgreSQLAdapter, AbstractMysqlAdapter, and possibly another third party adapter)
 ::ActiveRecord::ConnectionAdapters::AbstractAdapter.descendants.each do |adapter|
-  # Note: this would only prepend on AbstractMysqlAdapter and not on Mysql2Adapter because ```Mysql2Adapter < InsertRecorder``` becomes true immediately after AbstractMysqlAdapter prepends InsertRecorder
+  # In order not to touch AbstractMysqlAdapter thing, but to surely patch the concrete classes
+  next if adapter.descendants.any?
+
   adapter.send :prepend, DatabaseRewinder::InsertRecorder unless adapter < DatabaseRewinder::InsertRecorder
 end
 

data/lib/database_rewinder/multiple_statements_executor.rb

@@ -12,18 +12,18 @@ module DatabaseRewinder
         #TODO Use ADAPTER_NAME when we've dropped AR 4.1 support
         case self.class.name
         when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-          disable_referential_integrity { log(sql) { @connection.exec sql } }
+          disable_referential_integrity { log(sql) { (@raw_connection || @connection).exec sql } }
         when 'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
-          if @connection.query_options[:connect_flags] & Mysql2::Client::MULTI_STATEMENTS != 0
+          if (@raw_connection || @connection).query_options[:connect_flags] & Mysql2::Client::MULTI_STATEMENTS != 0
             disable_referential_integrity do
-              _result = log(sql) { @connection.query sql }
-              while @connection.next_result
+              _result = log(sql) { (@raw_connection || @connection).query sql }
+              while (@raw_connection || @connection).next_result
                 # just to make sure that all queries are finished
-                _result = @connection.store_result
+                _result = (@raw_connection || @connection).store_result
               end
             end
           else
-            query_options = @connection.query_options.dup
+            query_options = (@raw_connection || @connection).query_options.dup
             query_options[:connect_flags] |= Mysql2::Client::MULTI_STATEMENTS
             # opens another connection to the DB
             client = Mysql2::Client.new query_options
@@ -40,7 +40,7 @@ module DatabaseRewinder
             end
           end
         when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter'
-          disable_referential_integrity { log(sql) { @connection.execute_batch sql } }
+          disable_referential_integrity { log(sql) { (@raw_connection || @connection).execute_batch sql } }
         else
           raise 'Multiple deletion is not supported with the current database adapter.'
         end

data/lib/database_rewinder.rb

@@ -76,8 +76,14 @@ module DatabaseRewinder
       cache_key = get_cache_key(connection.pool)
       #NOTE connection.tables warns on AR 5 with some adapters
       tables = ActiveSupport::Deprecation.silence { connection.tables }
+      schema_migraion_table_name =
+        if ActiveRecord::SchemaMigration.respond_to?(:table_name)
+          ActiveRecord::SchemaMigration.table_name
+        else
+          ActiveRecord::SchemaMigration.new(connection).table_name  # AR >= 7.1
+        end
       @table_names_cache[cache_key] ||= tables.reject do |t|
-        (t == ActiveRecord::SchemaMigration.table_name) ||
+        (t == schema_migraion_table_name) ||
         (ActiveRecord::Base.respond_to?(:internal_metadata_table_name) && (t == ActiveRecord::Base.internal_metadata_table_name))
       end
     end

data/test/database_rewinder_test.rb

@@ -209,16 +209,34 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
 
   if ActiveRecord::VERSION::MAJOR >= 4
     sub_test_case 'migrations' do
-      test '.clean_all should not touch AR::SchemaMigration' do
-        begin
+      if ActiveRecord::VERSION::STRING >= '7.1'
+        test '.clean_all should not touch AR::SchemaMigration' do
+          schema_migration = ActiveRecord::SchemaMigration.new(ActiveRecord::Base.connection)
+          schema_migration.create_table
+
+          begin
+            schema_migration.create_version '001'
+            DatabaseRewinder.clean_all
+
+            assert_equal 0, Foo.count
+            assert_equal 1, schema_migration.count
+          ensure
+            schema_migration.drop_table
+          end
+        end
+      else
+        test '.clean_all should not touch AR::SchemaMigration' do
           ActiveRecord::SchemaMigration.create_table
-          ActiveRecord::SchemaMigration.create! version: '001'
-          DatabaseRewinder.clean_all
 
-          assert_equal 0, Foo.count
-          assert_equal 1, ActiveRecord::SchemaMigration.count
-        ensure
-          ActiveRecord::SchemaMigration.drop_table
+          begin
+            ActiveRecord::SchemaMigration.create! version: '001'
+            DatabaseRewinder.clean_all
+
+            assert_equal 0, Foo.count
+            assert_equal 1, ActiveRecord::SchemaMigration.count
+          ensure
+            ActiveRecord::SchemaMigration.drop_table
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner