database_rewinder 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd5388515381629b73558d7daa3907c06eb59ce55fbc6b6e5bdfc8a93e6b1872
-  data.tar.gz: 775cc8b24d4808317b4a521e3fed5568380d6222837543141d71a7ccf264a595
+  metadata.gz: 446177e88aadd696c5c94de335a7b16aa1f6a0dd28c354a9bbda1c4d5f49e9be
+  data.tar.gz: b071df2532cb7cf4a8c74b35a7c84a620c89fec3ffc499c908439fc595a995ca
 SHA512:
-  metadata.gz: ad1ae15b0ab5bd04ffd4908573b407a86a39ed2e35e5e2ae15b3502ba0dcfd3cb5edfa113759341f93923be88b98676597d53d268f673bbe846c6eba59507348
-  data.tar.gz: cdc9a216be4b1a234df1dd83ad89234fb4c43bed3d4f4dec41a20a04526b1b0569f4c680d0ca64623ae4276253a2d96dd0637d5eee12192e51e670372b5269ce
+  metadata.gz: 0d0824e4a05ae8afa8bde488b5b8fd8c7150316588f432852f39e7dfbc46bb2d43b9f72ba408c7568dc693d0cf366258f7eb93cb9f1030307eb3601959d5dd3e
+  data.tar.gz: f055c3a41b235b030a56525fbd596383bcf611709cf0b78d24d612cb996d0923b159e8624e24d7873b614275b0ebfa9c8b2dc4d4898e204180436cd8756e0748

data/.travis.yml

@@ -5,17 +5,19 @@ addons:
   mysql: '5.7'
 
 before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - "ruby -e 'exit RUBY_VERSION.to_f >= 2.6' && gem up bundler || gem i bundler -v '<2'"
+  # 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;
   - sudo service mysql restart
 
 
 cache: bundler
 
 env:
-  - DB=sqlite3
-  - DB=mysql
-  - DB=postgresql
+  matrix:
+    - DB=sqlite3
+    - DB=mysql
+    - DB=postgresql
 
 rvm:
   - 2.6.3
@@ -30,6 +32,9 @@ dist: xenial
 
 matrix:
   include:
+    - rvm: 2.7.1
+      gemfile: gemfiles/rails_60.gemfile
+      env: DB=postgresql
     - rvm: 2.6.3
       gemfile: gemfiles/rails_edge.gemfile
       env: DB=postgresql

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.2'
+  spec.version       = '0.9.3'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"

data/lib/database_rewinder.rb

@@ -73,7 +73,7 @@ module DatabaseRewinder
 
     # cache AR connection.tables
     def all_table_names(connection)
-      cache_key = connection.pool.spec.config
+      cache_key = get_cache_key(connection.pool)
       #NOTE connection.tables warns on AR 5 with some adapters
       tables = ActiveSupport::Deprecation.silence { connection.tables }
       @table_names_cache[cache_key] ||= tables.reject do |t|
@@ -81,7 +81,17 @@ module DatabaseRewinder
         (ActiveRecord::Base.respond_to?(:internal_metadata_table_name) && (t == ActiveRecord::Base.internal_metadata_table_name))
       end
     end
+
+    def get_cache_key(connection_pool)
+      if connection_pool.respond_to?(:db_config) # ActiveRecord >= 6.1
+        connection_pool.db_config.config
+      else
+        connection_pool.spec.config
+      end
+    end
   end
+
+  private_class_method :get_cache_key
 end
 
 begin

data/lib/database_rewinder/active_record_monkey.rb

@@ -7,9 +7,16 @@ module DatabaseRewinder
       super
     end
 
-    def exec_query(sql, *)
-      DatabaseRewinder.record_inserted_table self, sql
-      super
+    if Rails::VERSION::MAJOR < 5
+      def exec_query(sql, *)
+        DatabaseRewinder.record_inserted_table self, sql
+        super
+      end
+    else
+      def exec_query(sql, *, **)
+        DatabaseRewinder.record_inserted_table self, sql
+        super
+      end
     end
   end
 end

data/lib/database_rewinder/compatibility.rb

@@ -2,8 +2,8 @@
 
 module DatabaseRewinder
   module Compatibility
-    def clean_with(*args)
-      cleaners.each {|c| c.clean_with(*args)}
+    def clean_with(*args, **opts)
+      cleaners.each {|c| c.clean_with(*args, **opts)}
     end
 
     def cleaning
@@ -36,7 +36,7 @@ module DatabaseRewinder
     #    DatabaseRewinder[:active_record, connection: 'the_db_name']
     #
     # You can cleanup multiple databases for each test using this configuration.
-    def [](orm, connection: nil, **)
+    def [](orm = nil, connection: nil, **)
       if connection.nil?
         if orm.is_a? String
           connection = orm

data/test/database_rewinder_test.rb

@@ -183,7 +183,7 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
       @except = @cleaner.instance_variable_get(:@except)
       Foo.create! name: 'foo1'
       Bar.create! name: 'bar1'
-      DatabaseRewinder.clean_with :truncation, options
+      DatabaseRewinder.clean_with :truncation, **options
     end
 
     test 'with only option' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner