database_rewinder 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f3971ab455c27723cb88e96a001ad2971638b6f05d28d53893faaaeb287ddf
-  data.tar.gz: a57feb32a0f17562fc512703bafc7706c6863a03adafda705f7ee9831b94225a
+  metadata.gz: b151e420c4e1985e5674d1781dceae421a9e3d9e19c3486cf87529ac14399008
+  data.tar.gz: e1ad8090d602a4db4d71626b765c6f932ac8690ae8dfeee40d429f8071465812
 SHA512:
-  metadata.gz: a806f31a61677df1f79e664dcbdd21ca99814220c5d442d94b81dd6aa676c3cb1cab8b9639e0c1ced053131a276d207dfad3dbc374d091c0f6e31253da1e467f
-  data.tar.gz: debe586e77d5ec3931497406202d85f9feae447e78ee868b745a84f762b2a19f6ac02340a843ad91184da8ba02a7b943e050a1d9bd8ea28b0cb04e59800ccc22
+  metadata.gz: acca967b5d15e66623e5767fcc9304d56e0d19074f5c02619e77c50f6dacfb51bf0289e6ef64252884f2b2fb88ae198b6abde6b152d0beaf7c13e2c4df290552
+  data.tar.gz: 9be584317f373acaa2797ff723b4e0a2e7e8121a0aecad1920ecb01b06307224e35238e10ede1a5ec43a3a4eb74511b760b132711c4cbf8dfb55d52700626d26

data/.travis.yml

@@ -1,47 +1,71 @@
 language: ruby
 
+addons:
+  postgresql: '9.4'
+  mysql: '5.7'
+
 before_install:
-  - gem update --system
-  - gem install bundler
+  # 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.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
+  - 2.7.3
 
 gemfile:
   - gemfiles/rails_52.gemfile
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_60.gemfile
+  - gemfiles/rails_61.gemfile
 
 sudo: false
 
+dist: xenial
+
 matrix:
   include:
-    - rvm: 2.5.1
+    - rvm: 3.0.1
       gemfile: gemfiles/rails_edge.gemfile
-      env: DB=sqlite3
-    - rvm: 2.3.7
+      env: DB=postgresql
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_61.gemfile
+      env: DB=postgresql
+    - rvm: 2.6.7
+      gemfile: gemfiles/rails_60.gemfile
+      env: DB=postgresql
+    - rvm: 2.6.7
+      gemfile: gemfiles/rails_52.gemfile
+      env: DB=postgresql
+    - rvm: 2.5.9
+      gemfile: gemfiles/rails_51.gemfile
+      env: DB=postgresql
+    - rvm: 2.4.10
+      gemfile: gemfiles/rails_50.gemfile
+      env: DB=postgresql
+    - rvm: 2.3.8
       gemfile: gemfiles/rails_41.gemfile
-      env: DB=sqlite3
-    - rvm: 2.3.7
+      env: DB=postgresql
+    - rvm: 2.3.8
       gemfile: gemfiles/rails_40.gemfile
-      env: DB=sqlite3
+      env: DB=postgresql
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails_52.gemfile
+      env: DB=postgresql
     - rvm: 2.1.10
       gemfile: gemfiles/rails_42.gemfile
-      env: DB=sqlite3
+      env: DB=postgresql
     - rvm: 2.0.0
       gemfile: gemfiles/rails_42.gemfile
-      env: DB=sqlite3
+      env: DB=postgresql
 
   allow_failures:
     - gemfile: gemfiles/rails_edge.gemfile

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in database_rewinder.gemspec

data/README.md

@@ -23,9 +23,9 @@ This strategy was originally devised and implemented by Shingo Morita (@eudoxa)
 
 ## Supported versions
 
-* ActiveRecord 4.0, 4.1, 4.2, 5.0, 5.1, 5.2 (edge)
+* ActiveRecord 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0 (edge)
 
-* Ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 (trunk)
+* Ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1 (trunk)
 
 ## Installation
 
@@ -98,7 +98,7 @@ In cases of this situation, bundle database\_rewinder and add the following conf
 
 ```ruby
 RSpec.configure do |config|
-  config.use_transactional_examples = false
+  config.use_transactional_tests = false
 
   ...
 end

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler'
 require 'bundler/setup'
 require "bundler/gem_tasks"

data/database_rewinder.gemspec

@@ -1,11 +1,12 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.9.0'
+  spec.version       = '0.9.5'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"
@@ -18,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'rails'

data/gemfiles/rails_40.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.0.0'
 gem 'pg', '~> 0.21'
 gem 'mysql2', '~> 0.3.10'
+gem 'sqlite3', '< 1.4'
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
 gemspec path: '../'

data/gemfiles/rails_41.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.1.0'
 gem 'pg', '~> 0.21'
 gem 'mysql2', '~> 0.3.13'
+gem 'sqlite3', '< 1.4'
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
 gemspec path: '../'

data/gemfiles/rails_42.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.2.0'
 gem 'pg', '~> 0.21'
 gem 'mysql2', '~> 0.4.0'
+gem 'sqlite3', '< 1.4'
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 
 gemspec path: '../'

data/gemfiles/rails_50.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.0.0'
 gem 'pg', '~> 0.21'
+gem 'sqlite3', '< 1.4'
 
 gemspec path: '../'

data/gemfiles/rails_52.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.2.0'
+gem 'rails', '~> 5.2.0', git: 'https://github.com/rails/rails', branch: '5-2-stable'
 gem 'pg', '~> 0.21'
 
 gemspec path: '../'

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'selenium-webdriver'
+
+gemspec path: '../'

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.0'
+gem 'selenium-webdriver'
+
+gemspec path: '../'

data/gemfiles/rails_edge.gemfile

@@ -4,6 +4,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', github: 'rails/rails'
+gem 'rails', github: 'rails/rails', branch: 'main'
+gem 'selenium-webdriver'
 
 gemspec path: '../'

data/lib/database_rewinder.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_relative 'database_rewinder/cleaner'
 
 module DatabaseRewinder
   VERSION = Gem.loaded_specs['database_rewinder'].version.to_s
@@ -17,7 +16,7 @@ module DatabaseRewinder
     end
 
     def create_cleaner(connection_name)
-      config = database_configuration[connection_name] or raise %Q[Database configuration named "#{connection_name}" is not configured.]
+      config = configuration_hash_for(connection_name) or raise %Q[Database configuration named "#{connection_name}" is not configured.]
 
       Cleaner.new(config: config, connection_name: connection_name, only: @only, except: @except).tap {|c| @cleaners << c}
     end
@@ -49,7 +48,7 @@ module DatabaseRewinder
       end or return
 
       sql.split(';').each do |statement|
-        match = statement.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
+        match = statement.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"(]+)[`"]?)*/i)
         next unless match
 
         table = match[1]
@@ -74,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|
@@ -82,7 +81,32 @@ 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.configuration_hash
+      else
+        connection_pool.spec.config
+      end
+    end
+
+    def configuration_hash_for(connection_name)
+      if database_configuration.respond_to?(:configs_for)
+        hash_config = database_configuration.configs_for(env_name: connection_name).first
+        if hash_config
+          if hash_config.respond_to?(:configuration_hash)
+            hash_config.configuration_hash.stringify_keys
+          else
+            hash_config.config
+          end
+        end
+      else
+        database_configuration[connection_name]
+      end
+    end
   end
+
+  private_class_method :configuration_hash_for, :get_cache_key
 end
 
 begin
@@ -91,4 +115,5 @@ begin
 rescue LoadError
   DatabaseRewinder.init
   require_relative 'database_rewinder/active_record_monkey'
+  require_relative 'database_rewinder/cleaner'
 end

data/lib/database_rewinder/active_record_monkey.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DatabaseRewinder
   module InsertRecorder
     def execute(sql, *)
@@ -6,9 +7,16 @@ module DatabaseRewinder
       super
     end
 
-    def exec_query(sql, *)
-      DatabaseRewinder.record_inserted_table self, sql
-      super
+    if ActiveRecord::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/cleaner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'multiple_statements_executor'
 
 using DatabaseRewinder::MultipleStatementsExecutor

data/lib/database_rewinder/compatibility.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 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
@@ -35,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/lib/database_rewinder/dummy_model.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DatabaseRewinder
   class DummyModel < ActiveRecord::Base
     class << self

data/lib/database_rewinder/multiple_statements_executor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DatabaseRewinder
   module MultipleStatementsExecutor
     refine ActiveRecord::ConnectionAdapters::AbstractAdapter do

data/lib/database_rewinder/railtie.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
+
 module DatabaseRewinder
   class Railtie < ::Rails::Railtie
     initializer 'database_rewinder', after: 'active_record.initialize_database' do
       ActiveSupport.on_load :active_record do
         DatabaseRewinder.init
         require_relative 'active_record_monkey'
+
+        require_relative 'cleaner'
       end
     end
   end

data/test/active_record_monkey_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class DatabaseRewinder::InsertRecorderTest < ActiveSupport::TestCase

data/test/cleaner_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class DatabaseRewinder::CleanerTest < ActiveSupport::TestCase

data/test/config/database.yml

@@ -1,45 +1,44 @@
-sqlite3: &sqlite3
+<% case ENV['DB']
+   when 'sqlite3' %>
+test:
   adapter: sqlite3
   database: db/database_rewinder_test.sqlite3
   pool: 5
   timeout: 5000
 
-sqlite3_2: &sqlite3_2
+test2:
   adapter: sqlite3
   database: db/database_rewinder_test2.sqlite3
   pool: 5
   timeout: 5000
 
-mysql: &mysql
+<% when 'mysql' %>
+test:
   adapter: mysql2
   host: localhost
   username: root
   password:
   database: database_rewinder_test
 
-mysql_2: &mysql_2
+test2:
   adapter: mysql2
   host: localhost
   username: root
   password:
   database: database_rewinder_test2
 
-postgresql: &postgresql
+<% when 'postgresql' %>
+test:
   adapter: postgresql
   host: localhost
   username: postgres
   password:
   database: database_rewinder_test
 
-postgresql_2: &postgresql_2
+test2:
   adapter: postgresql
   host: localhost
   username: postgres
   password:
   database: database_rewinder_test2
-
-test:
-  <<: *<%= ENV['DB'] %>
-
-test2:
-  <<: *<%= "#{ENV['DB']}_2" %>
+<% end %>

data/test/database_rewinder_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
@@ -75,6 +76,25 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
       DatabaseRewinder.database_configuration = nil
     end
 
+    sub_test_case 'via General Active Record insertions' do
+      setup do
+        DatabaseRewinder.cleaners
+        @cleaner = DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == (ENV['DB'] == 'sqlite3' ? 'db/database_rewinder_test.sqlite3' : 'database_rewinder_test')}
+      end
+
+      test 'create' do
+        Bar.create name: 'bar1'
+        assert_equal ['bars'], @cleaner.inserted_tables
+      end
+
+      if ActiveRecord::VERSION::STRING >= '6'
+        test 'insert_all' do
+          Bar.insert_all! [{name: 'bar1'}]
+          assert_equal ['bars'], @cleaner.inserted_tables
+        end
+      end
+    end
+
     sub_test_case 'common database' do
       test 'include database name' do
         perform_insert 'INSERT INTO "database"."foos" ("name") VALUES (?)'
@@ -94,6 +114,10 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
         SQL
         assert_equal ['foos'], @cleaner.inserted_tables
       end
+      test 'without spaces between table name and columns list' do
+        perform_insert 'INSERT INTO foos(name) VALUES (?)'
+        assert_equal ['foos'], @cleaner.inserted_tables
+      end
 
       test 'with multi statement query' do
         perform_insert <<-SQL
@@ -159,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

data/test/fake_app.rb

@@ -17,30 +17,30 @@ load 'active_record/railties/databases.rake'
 
 require 'active_record/base'
 ActiveRecord::Tasks::DatabaseTasks.root ||= Rails.root
-ActiveRecord::Tasks::DatabaseTasks.drop_current ENV['DB']
-ActiveRecord::Tasks::DatabaseTasks.drop_current "#{ENV['DB']}_2"
-ActiveRecord::Tasks::DatabaseTasks.create_current ENV['DB']
-ActiveRecord::Tasks::DatabaseTasks.create_current "#{ENV['DB']}_2"
+ActiveRecord::Tasks::DatabaseTasks.drop_current 'test'
+ActiveRecord::Tasks::DatabaseTasks.drop_current 'test2'
+ActiveRecord::Tasks::DatabaseTasks.create_current 'test'
+ActiveRecord::Tasks::DatabaseTasks.create_current 'test2'
 
 # models
 class Foo < ActiveRecord::Base; end
 class Bar < ActiveRecord::Base; end
 class Baz < ActiveRecord::Base; end
 class Quu < ActiveRecord::Base
-  establish_connection "#{ENV['DB']}_2".to_sym
+  establish_connection :test2
 end
 
 # migrations
 class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
   def self.up
-    ActiveRecord::Base.establish_connection ENV['DB'].to_sym
-    create_table(:bars) {|t| t.string :name }
+    ActiveRecord::Base.establish_connection :test
+    create_table(:bars) {|t| t.string :name; t.index :name, unique: true }
     create_table(:foos) {|t| t.string :name; t.references :bar, foreign_key: true }
     create_table(:bazs) {|t| t.string :name }
 
-    test2_connection = ActiveRecord::Base.establish_connection("#{ENV['DB']}_2".to_sym).connection
+    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
     test2_connection.create_table(:quus) {|t| t.string :name }
-    ActiveRecord::Base.establish_connection ENV['DB'].to_sym
+    ActiveRecord::Base.establish_connection :test
   end
 
   def self.down
@@ -48,8 +48,8 @@ class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     drop_table(:bars) {|t| t.string :name }
     drop_table(:bazs) {|t| t.string :name }
 
-    test2_connection = ActiveRecord::Base.establish_connection("#{ENV['DB']}_2".to_sym).connection
+    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
     test2_connection.drop_table :quus
-    ActiveRecord::Base.establish_connection ENV['DB'].to_sym
+    ActiveRecord::Base.establish_connection :test
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ENV['RAILS_ENV'] ||= 'test'
 
 $LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
@@ -9,6 +10,10 @@ require 'active_record'
 require 'database_rewinder'
 require 'fake_app'
 require 'test/unit/rails/test_help'
+begin
+  require 'selenium/webdriver'  # rails 6
+rescue LoadError
+end
 
 migrated = ActiveRecord::Base.connection.respond_to?(:data_source_exists?) ? ActiveRecord::Base.connection.data_source_exists?('foos') : ActiveRecord::Base.connection.table_exists?('foos')
 CreateAllTables.up unless migrated

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,8 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/database_rewinder.rb
 - lib/database_rewinder/active_record_monkey.rb
@@ -147,7 +149,7 @@ homepage: https://github.com/amatsuda/database_rewinder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,9 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner
 test_files: