database_rewinder 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65d98970a4cf3742c0ea0254aedb60cc3d64260f9b3bbca199bad7880a178aa
-  data.tar.gz: 131690c4430bc96b9fb06d00eaf6474bbe23f9bb038e44f18c00240f5ff9372d
+  metadata.gz: dd5388515381629b73558d7daa3907c06eb59ce55fbc6b6e5bdfc8a93e6b1872
+  data.tar.gz: 775cc8b24d4808317b4a521e3fed5568380d6222837543141d71a7ccf264a595
 SHA512:
-  metadata.gz: 02cdab1001bce6f92944c765d696ee94e6ea2cdddb4ffe9b438a184d62fd0adb8ba9cb2521d1c3a655cfbe52a653ab62f56f3259244cc55ea5f420240aa814be
-  data.tar.gz: 11a8155b683374275680fbb16c03b2d6f5f8af4fa51310e6e05e49b1330f6dbf5ba8793643617085cb6d2765372c61d5ef7a0887639e351554b52492c68e0417
+  metadata.gz: ad1ae15b0ab5bd04ffd4908573b407a86a39ed2e35e5e2ae15b3502ba0dcfd3cb5edfa113759341f93923be88b98676597d53d268f673bbe846c6eba59507348
+  data.tar.gz: cdc9a216be4b1a234df1dd83ad89234fb4c43bed3d4f4dec41a20a04526b1b0569f4c680d0ca64623ae4276253a2d96dd0637d5eee12192e51e670372b5269ce

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
 
+addons:
+  postgresql: '9.4'
+  mysql: '5.7'
+
 before_install:
-  - gem update --system
-  - gem install bundler
+  - 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'"
+  - sudo service mysql restart
+
 
 cache: bundler
 
@@ -12,36 +18,42 @@ env:
   - DB=postgresql
 
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
+  - 2.6.3
 
 gemfile:
   - gemfiles/rails_52.gemfile
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_60.gemfile
 
 sudo: false
 
+dist: xenial
+
 matrix:
   include:
-    - rvm: 2.5.1
+    - rvm: 2.6.3
       gemfile: gemfiles/rails_edge.gemfile
-      env: DB=sqlite3
-    - rvm: 2.3.7
+      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.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/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.1'
+  spec.version       = '0.9.2'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"
@@ -19,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_edge.gemfile

@@ -5,5 +5,6 @@ git_source(:github) do |repo_name|
 end
 
 gem 'rails', github: 'rails/rails'
+gem 'selenium-webdriver'
 
 gemspec path: '../'

data/lib/database_rewinder.rb

@@ -48,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]

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

@@ -76,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 (?)'
@@ -95,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

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

@@ -10,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.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2020-01-03 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,7 @@ files:
 - 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
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0.beta3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner