database_rewinder 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f7e55817b3442c32f74c7575d83dec47b44ee73c8e0dd10686869ffca8f720
-  data.tar.gz: 3f5e43c24343437bd8d69f3ee00015c96f3578092785d9bf166d1f3ddf72e21f
+  metadata.gz: f3f3971ab455c27723cb88e96a001ad2971638b6f05d28d53893faaaeb287ddf
+  data.tar.gz: a57feb32a0f17562fc512703bafc7706c6863a03adafda705f7ee9831b94225a
 SHA512:
-  metadata.gz: 1de60041450d9fb332c53a96c36fa20414e39dfb8952834188e0885f2e99d0230b34d3e10fe3c7bd5a8147784aa38136e5f4c3e7af2636e3e6f3a156918f16d4
-  data.tar.gz: d0b8b8c867fb7149fd0a374a49bcae26330ebc5329b208987dc5f416224e996769b897dc7752205a7ea40f5e05a156fa1e98d1098516d8bfd5b3d3b71608299a
+  metadata.gz: a806f31a61677df1f79e664dcbdd21ca99814220c5d442d94b81dd6aa676c3cb1cab8b9639e0c1ced053131a276d207dfad3dbc374d091c0f6e31253da1e467f
+  data.tar.gz: debe586e77d5ec3931497406202d85f9feae447e78ee868b745a84f762b2a19f6ac02340a843ad91184da8ba02a7b943e050a1d9bd8ea28b0cb04e59800ccc22

data/.travis.yml

@@ -12,25 +12,28 @@ env:
   - DB=postgresql
 
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
+  - 2.2.10
 
 gemfile:
+  - gemfiles/rails_52.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_42.gemfile
-  - gemfiles/rails_edge.gemfile
 
 sudo: false
 
 matrix:
   include:
-    - rvm: 2.3.6
+    - rvm: 2.5.1
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DB=sqlite3
+    - rvm: 2.3.7
       gemfile: gemfiles/rails_41.gemfile
       env: DB=sqlite3
-    - rvm: 2.3.6
+    - rvm: 2.3.7
       gemfile: gemfiles/rails_40.gemfile
       env: DB=sqlite3
     - rvm: 2.1.10
@@ -39,3 +42,6 @@ matrix:
     - rvm: 2.0.0
       gemfile: gemfiles/rails_42.gemfile
       env: DB=sqlite3
+
+  allow_failures:
+    - gemfile: gemfiles/rails_edge.gemfile

data/database_rewinder.gemspec

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

data/gemfiles/rails_42.gemfile

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

data/gemfiles/rails_edge.gemfile

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

data/lib/database_rewinder.rb

@@ -48,13 +48,15 @@ module DatabaseRewinder
         end
       end or return
 
-      match = sql.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
-      return unless match
-
-      table = match[1]
-      if table
-        cleaner.inserted_tables << table unless cleaner.inserted_tables.include? table
-        cleaner.pool ||= connection.pool
+      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
+        end
       end
     end
 

data/test/database_rewinder_test.rb

@@ -94,6 +94,14 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
         SQL
         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

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,6 +13,8 @@ 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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
+- gemfiles/rails_52.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
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner