database_rewinder 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b376682c2f67881f7a3f6d94cdee69ca9c2d91d4
-  data.tar.gz: bbe492eaf822b8964c6921591fdc348d87afcd91
+  metadata.gz: fdff13637a829acd582b4c01d312b2a13feb61d4
+  data.tar.gz: e984897076c597c332af05d88f70123f299fd35f
 SHA512:
-  metadata.gz: 58460132f5cbfaa52a83c962511a2092e079cc66c6295ea3a702ca105c136f2bfbdbff66b933b83b1ce5c0268d92b0ba024d514fa814358677c38eb13e109b36
-  data.tar.gz: 80ec799e958f0e5eb29edad2e9aaf975120eda596cb27093c8832792ca8e5cafa88b7e478f05129cb43efaf11d22e4a786ec3d3d61593462fe47f844b60c7010
+  metadata.gz: 36f33700c2dee70e5e05a4af6447651b34ce13cae4b4e45ab4c4c73439ea69d49965d86c052133a0f75e681f104d3b9881efbbaf22d34e47c375b5c3b7213708
+  data.tar.gz: e78829201e040887e19d73affb3780bcb563758ed4956ed659958fcabea4fcc11680ce6aa742afd6631c5491c60b49782fa6d54e26fc7d5650bf0de761d9f3e4

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
+  - 2.2

data/README.md

@@ -22,9 +22,9 @@ This strategy was originally devised and implemented by Shingo Morita (@eudoxa)
 
 ## Supported versions
 
-* ActiveRecord 3.2, 4.0, 4.1
+* ActiveRecord 3.2, 4.0, 4.1, 4.2
 
-* Ruby 2.0, 2.1
+* Ruby 2.0, 2.1, 2.2
 
 ## Installation
 

data/database_rewinder.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.4.1'
+  spec.version       = '0.4.2'
   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

@@ -47,8 +47,10 @@ module DatabaseRewinder
         end
       end or return
 
-      match = sql.match(/\AINSERT INTO [`"]?([^\s`"]+)[`"]?/i)
-      table = match[1] if match
+      match = sql.match(/\AINSERT INTO (?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
+      return unless match
+
+      table = match[1]
       if table
         cleaner.inserted_tables << table unless cleaner.inserted_tables.include? table
         cleaner.pool ||= connection.pool

data/lib/database_rewinder/active_record_monkey.rb

@@ -12,6 +12,18 @@ module DatabaseRewinder
   end
 end
 
-::ActiveRecord::ConnectionAdapters::SQLite3Adapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::SQLite3Adapter
-::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send :prepend, DatabaseRewinder::InsertRecorder if defined? ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
+begin
+  require 'active_record/connection_adapters/sqlite3_adapter'
+  ::ActiveRecord::ConnectionAdapters::SQLite3Adapter.send :prepend, DatabaseRewinder::InsertRecorder
+rescue LoadError
+end
+begin
+  require 'active_record/connection_adapters/postgresql_adapter'
+  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :prepend, DatabaseRewinder::InsertRecorder
+rescue LoadError
+end
+begin
+  require 'active_record/connection_adapters/abstract_mysql_adapter'
+  ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send :prepend, DatabaseRewinder::InsertRecorder
+rescue LoadError
+end

data/spec/database_rewinder_spec.rb

@@ -23,14 +23,39 @@ describe DatabaseRewinder do
       @cleaner = DatabaseRewinder.create_cleaner 'foo'
       connection = double('connection').as_null_object
       connection.instance_variable_set :'@config', {adapter: 'sqlite3', database: File.expand_path('db/test.sqlite3', Rails.root) }
-      DatabaseRewinder.record_inserted_table(connection, 'INSERT INTO "foos" ("name") VALUES (?)')
+      DatabaseRewinder.record_inserted_table(connection, sql)
     end
     after do
       DatabaseRewinder.database_configuration = nil
     end
     subject { @cleaner }
 
-    its(:inserted_tables) { should == ['foos'] }
+    context 'common database' do
+      context 'include database name' do
+        let(:sql) { 'INSERT INTO "database"."foos" ("name") VALUES (?)' }
+        its(:inserted_tables) { should == ['foos'] }
+      end
+      context 'only table name' do
+        let(:sql) { 'INSERT INTO "foos" ("name") VALUES (?)' }
+        its(:inserted_tables) { should == ['foos'] }
+      end
+    end
+
+    context 'DataBase accepts more than one dots in an object notation(exp: SQLServer)' do
+      context 'full joined' do
+      let(:sql) { 'INSERT INTO server.database.schema.foos ("name") VALUES (?)' }
+        its(:inserted_tables) { should == ['foos'] }
+      end
+      context 'missing one' do
+        let(:sql) { 'INSERT INTO database..foos ("name") VALUES (?)' }
+        its(:inserted_tables) { should == ['foos'] }
+      end
+
+      context 'missing two' do
+        let(:sql) { 'INSERT INTO server...foos ("name") VALUES (?)' }
+        its(:inserted_tables) { should == ['foos'] }
+      end
+    end
   end
 
   describe '.clean' do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2015-01-22 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A minimalist's tiny and ultra-fast database cleaner
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT_LICENSE
 - README.md
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner