database_rewinder 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b151e420c4e1985e5674d1781dceae421a9e3d9e19c3486cf87529ac14399008
-  data.tar.gz: e1ad8090d602a4db4d71626b765c6f932ac8690ae8dfeee40d429f8071465812
+  metadata.gz: cdfa4a22f839cc429f7334f0c175a8f51a1c398e67cb10ebe831f9ba18761fed
+  data.tar.gz: f7bc66b8f216587fdc6af220a5033d973c6da09c2035a0c63c8a5741b31c5fd4
 SHA512:
-  metadata.gz: acca967b5d15e66623e5767fcc9304d56e0d19074f5c02619e77c50f6dacfb51bf0289e6ef64252884f2b2fb88ae198b6abde6b152d0beaf7c13e2c4df290552
-  data.tar.gz: 9be584317f373acaa2797ff723b4e0a2e7e8121a0aecad1920ecb01b06307224e35238e10ede1a5ec43a3a4eb74511b760b132711c4cbf8dfb55d52700626d26
+  metadata.gz: 83b2df863231cef40e644e8a6e567862842bb630cbebd965769a19e365c23dd1877675c548e81150e797b95e8f069bc5b45119c3f7186944d44cd9f889c42ed8
+  data.tar.gz: 34aa414d520248f0989087acb94d1e2c01f861c84baceb6cfa89c8bbb424018374fc75e261d52e18d651e994a25ae62e2ed447215f8cbd81b19ae729e7de301d

data/.travis.yml

@@ -6,8 +6,8 @@ addons:
 
 before_install:
   # install older versions of rubygems and bundler only on Ruby < 2.7
-  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i rubygems-update -v '<3' && update_rubygems; fi;
-  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i bundler -v '<2'; fi;
+  - if [ "${TRAVIS_RUBY_VERSION}" != "ruby-head" ] && [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i rubygems-update -v '<3' && update_rubygems; fi;
+  - if [ "${TRAVIS_RUBY_VERSION}" != "ruby-head" ] && [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i bundler -v '<2'; fi;
   - sudo service mysql restart
 
 
@@ -33,12 +33,30 @@ dist: xenial
 
 matrix:
   include:
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=postgresql
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_61.gemfile
+      env: DB=postgresql
     - rvm: 3.0.1
       gemfile: gemfiles/rails_edge.gemfile
       env: DB=postgresql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=mysql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=sqlite3
     - rvm: 3.0.1
       gemfile: gemfiles/rails_61.gemfile
       env: DB=postgresql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_61.gemfile
+      env: DB=mysql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_61.gemfile
+      env: DB=sqlite3
     - rvm: 2.6.7
       gemfile: gemfiles/rails_60.gemfile
       env: DB=postgresql
@@ -68,4 +86,5 @@ matrix:
       env: DB=postgresql
 
   allow_failures:
+    - rvm: ruby-head
     - gemfile: gemfiles/rails_edge.gemfile

data/database_rewinder.gemspec

@@ -6,10 +6,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.9.5'
+  spec.version       = '0.9.6'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
-  spec.description   = "A minimalist's tiny and ultra-fast database cleaner"
+  spec.description   = "A minimalist's tiny and ultra-fast database cleaner for Active Record"
   spec.summary       = "A minimalist's tiny and ultra-fast database cleaner"
   spec.homepage      = 'https://github.com/amatsuda/database_rewinder'
   spec.license       = "MIT"

data/lib/database_rewinder.rb

@@ -92,7 +92,7 @@ module DatabaseRewinder
 
     def configuration_hash_for(connection_name)
       if database_configuration.respond_to?(:configs_for)
-        hash_config = database_configuration.configs_for(env_name: connection_name).first
+        hash_config = database_configuration_for(connection_name)
         if hash_config
           if hash_config.respond_to?(:configuration_hash)
             hash_config.configuration_hash.stringify_keys
@@ -104,6 +104,22 @@ module DatabaseRewinder
         database_configuration[connection_name]
       end
     end
+
+    def database_configuration_for(connection_name)
+      traditional_configuration_for(connection_name) || multiple_database_configuration_for(connection_name)
+    end
+
+    def traditional_configuration_for(connection_name)
+      database_configuration.configs_for(env_name: connection_name).first
+    end
+
+    def multiple_database_configuration_for(connection_name)
+      if (ActiveRecord::VERSION::MAJOR >= 6) && (ActiveRecord::VERSION::MINOR >= 1)
+        database_configuration.configs_for(name: connection_name)
+      else
+        database_configuration.configs_for(spec_name: connection_name)
+      end
+    end
   end
 
   private_class_method :configuration_hash_for, :get_cache_key

data/lib/database_rewinder/active_record_monkey.rb

@@ -2,29 +2,66 @@
 
 module DatabaseRewinder
   module InsertRecorder
-    def execute(sql, *)
-      DatabaseRewinder.record_inserted_table self, sql
-      super
+    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
+      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
 
-    if ActiveRecord::VERSION::MAJOR < 5
-      def exec_query(sql, *)
-        DatabaseRewinder.record_inserted_table self, sql
-        super
+    # 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
-    else
-      def exec_query(sql, *, **)
-        DatabaseRewinder.record_inserted_table self, sql
-        super
+      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
+        end
       end
     end
   end
 end
 
-::ActiveRecord::ConnectionAdapters::SQLite3Adapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::SQLite3Adapter
-::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
 
+# 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
+  adapter.send :prepend, DatabaseRewinder::InsertRecorder unless adapter < DatabaseRewinder::InsertRecorder
+end
+
+# Third party adapters that might be loaded in the future
 def (::ActiveRecord::ConnectionAdapters::AbstractAdapter).inherited(adapter)
-  adapter.prepend DatabaseRewinder::InsertRecorder
+  adapter.send :prepend, DatabaseRewinder::InsertRecorder
 end

data/test/database_rewinder_test.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
-  if ActiveRecord::VERSION::STRING >= '5'
+  if ActiveRecord::VERSION::MAJOR >= 5
     self.use_transactional_tests = false
   else
     self.use_transactional_fixtures = false
@@ -44,6 +44,54 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
           DatabaseRewinder[:aho, connection: 'ccc']
         end
       end
+
+      if ActiveRecord::VERSION::MAJOR >= 6
+        sub_test_case 'with traditional configurations' do
+          test 'simply giving a connection name only' do
+            assert_cleaners_added ['aaa'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'aaa' => {'adapter' => 'sqlite3', 'database' => ':memory:'}})
+              DatabaseRewinder['aaa']
+            end
+          end
+
+          test 'giving a connection name via Hash with :connection key' do
+            assert_cleaners_added ['bbb'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'bbb' => {'adapter' => 'sqlite3', 'database' => ':memory:'}})
+              DatabaseRewinder[connection: 'bbb']
+            end
+          end
+
+          test 'the Cleaner compatible syntax' do
+            assert_cleaners_added ['ccc'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'ccc' => {'adapter' => 'sqlite3', 'database' => ':memory:'}})
+              DatabaseRewinder[:aho, connection: 'ccc']
+            end
+          end
+        end
+
+        sub_test_case 'with multiple database configurations' do
+          test 'simply giving a connection name only' do
+            assert_cleaners_added ['aaa'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'test' => {'aaa' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}})
+              DatabaseRewinder['aaa']
+            end
+          end
+
+          test 'giving a connection name via Hash with :connection key' do
+            assert_cleaners_added ['bbb'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'test' => {'bbb' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}})
+              DatabaseRewinder[connection: 'bbb']
+            end
+          end
+
+          test 'the Cleaner compatible syntax' do
+            assert_cleaners_added ['ccc'] do
+              DatabaseRewinder.database_configuration = ActiveRecord::DatabaseConfigurations.new({'test' => {'ccc' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}})
+              DatabaseRewinder[:aho, connection: 'ccc']
+            end
+          end
+        end
+      end
     end
 
     test 'for connecting to multiple databases' do
@@ -87,7 +135,7 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
         assert_equal ['bars'], @cleaner.inserted_tables
       end
 
-      if ActiveRecord::VERSION::STRING >= '6'
+      if ActiveRecord::VERSION::MAJOR >= 6
         test 'insert_all' do
           Bar.insert_all! [{name: 'bar1'}]
           assert_equal ['bars'], @cleaner.inserted_tables
@@ -159,7 +207,7 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
     assert_equal 0, Bar.count
   end
 
-  if ActiveRecord::VERSION::STRING >= '4'
+  if ActiveRecord::VERSION::MAJOR >= 4
     sub_test_case 'migrations' do
       test '.clean_all should not touch AR::SchemaMigration' do
         begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A minimalist's tiny and ultra-fast database cleaner
+description: A minimalist's tiny and ultra-fast database cleaner for Active Record
 email:
 - ronnie@dio.jp
 executables: []
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner