database_rewinder 0.8.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f7e55817b3442c32f74c7575d83dec47b44ee73c8e0dd10686869ffca8f720
-  data.tar.gz: 3f5e43c24343437bd8d69f3ee00015c96f3578092785d9bf166d1f3ddf72e21f
+  metadata.gz: f79ac7f52a4377e3b0991fc87a7e0ae0fe50cfc5af519a009d5470e6d8d7e5e3
+  data.tar.gz: 1fc00b427798e7bb7a573bd13818da4b8a41abe99182b1da7cebc92d938db931
 SHA512:
-  metadata.gz: 1de60041450d9fb332c53a96c36fa20414e39dfb8952834188e0885f2e99d0230b34d3e10fe3c7bd5a8147784aa38136e5f4c3e7af2636e3e6f3a156918f16d4
-  data.tar.gz: d0b8b8c867fb7149fd0a374a49bcae26330ebc5329b208987dc5f416224e996769b897dc7752205a7ea40f5e05a156fa1e98d1098516d8bfd5b3d3b71608299a
+  metadata.gz: 65a551ce2bbe957514861dd56e0e4f758ea4f0c93e7ca6052efb24b2033b68c200228253dfafe6f9737214edaf870087c48300d15be854849f7a5a6d0c797a0d
+  data.tar.gz: 841d80ce6639746df70f78b728b5498a117e4f7cfca84e4e8de7de4bc1c2c393f5cfb60c4827e9b551d9a49bd67ecbc30ecf27ad4042cd38d457c23a09e7614c

data/.travis.yml

@@ -1,41 +1,64 @@
 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.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6.3
 
 gemfile:
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_42.gemfile
-  - gemfiles/rails_edge.gemfile
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
 
 sudo: false
 
+dist: xenial
+
 matrix:
   include:
-    - rvm: 2.3.6
+    - rvm: 2.7.1
+      gemfile: gemfiles/rails_60.gemfile
+      env: DB=postgresql
+    - rvm: 2.6.3
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=postgresql
+    - rvm: 2.5.5
+      gemfile: gemfiles/rails_51.gemfile
+      env: DB=postgresql
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_50.gemfile
+      env: DB=postgresql
+    - rvm: 2.3.8
       gemfile: gemfiles/rails_41.gemfile
-      env: DB=sqlite3
-    - rvm: 2.3.6
+      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,7 +23,7 @@ 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 (edge)
 
 * Ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 (trunk)
 

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.8.3'
+  spec.version       = '0.9.4'
   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

@@ -2,6 +2,8 @@ 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_51.gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.1.0'
 gem 'pg', '~> 0.21'
+gem 'capybara', '~> 2.13'
+gem 'puma'
 
 gemspec path: '../'

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+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_edge.gemfile

@@ -5,6 +5,6 @@ git_source(:github) do |repo_name|
 end
 
 gem 'rails', github: 'rails/rails'
-gem 'arel', github: 'rails/arel'
+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
@@ -48,13 +47,15 @@ module DatabaseRewinder
         end
       end or return
 
-      match = sql.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
-      return unless match
+      sql.split(';').each do |statement|
+        match = statement.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"(]+)[`"]?)*/i)
+        next unless match
 
-      table = match[1]
-      if table
-        cleaner.inserted_tables << table unless cleaner.inserted_tables.include? table
-        cleaner.pool ||= connection.pool
+        table = match[1]
+        if table
+          cleaner.inserted_tables << table unless cleaner.inserted_tables.include? table
+          cleaner.pool ||= connection.pool
+        end
       end
     end
 
@@ -72,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|
@@ -80,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
@@ -89,4 +100,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,18 @@ 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
+          INSERT INTO "foos" ("name") VALUES (?);
+          INSERT INTO "bars" ("name") VALUES (?)
+        SQL
+        assert_equal ['foos', 'bars'], @cleaner.inserted_tables
+      end
     end
 
     sub_test_case 'Database accepts more than one dots in an object notation (e.g. SQLServer)' do
@@ -151,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

@@ -2,7 +2,6 @@
 
 ENV['DB'] ||= 'sqlite3'
 require 'active_record/railtie'
-load 'active_record/railties/databases.rake'
 
 module DatabaseRewinderTestApp
   Application = Class.new(Rails::Application) do
@@ -14,32 +13,34 @@ module DatabaseRewinderTestApp
   end.initialize!
 end
 
+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
@@ -47,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.8.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2020-05-14 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
@@ -127,6 +127,8 @@ files:
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/database_rewinder.rb
 - lib/database_rewinder/active_record_monkey.rb
@@ -161,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner