database_flusher 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cac9582ff73ebe0151abb8ea901bdae8280dc4
-  data.tar.gz: 99ebfe15fbf6de3c1ac4d479f7bda06ec6c89995
+  metadata.gz: 20a81343383744be91dbda01a0a476b136c05cba
+  data.tar.gz: c060ed34325bee77a009ff4f41c15979bcd3bf18
 SHA512:
-  metadata.gz: 1b30f3618eff2f27ecb506c79ee2d80df941ac008ddbbed8c505f82b6df9bd31344ef6cecaa9534987450b49c7e80f2390b815dbb910ba56f2b256f7e9c9d56c
-  data.tar.gz: a5b2ce6762f219a3172c4db6eb229a2a1a0ee5344b9956690ebbc6bda4e41fa9152c9adc4a76bdd1ec28dc1e01b26ff4572a5106c811a430e5c5b9ef0ecc5635
+  metadata.gz: e5d99764bdebeb9203adcadbd50db85b7ce3ea1293fd00af78b743e79f068b47a98249bddb7ad22a84b8809e11d6f8d633c2fc8a93bd3af0ffe8cb9bc3ffee51
+  data.tar.gz: 69b22da932aee52dce7c4fb7935b87255570f4b84960bf6c1d9426ddb47c0898b1df436dd8f76b96c820864b549dd1edd3971ee8c824f6ae86c060bc3f51ed9b

data/README.md

@@ -105,14 +105,23 @@ end
 DatabaseFlusher[:active_record].strategy = :transaction
 DatabaseFlusher[:mongoid].strategy = :deletion
 
-# Use Around hook to make sure it runs after capybara session reset.
-Around do |scenario, block|
+# Use Before hook to make sure it runs after capybara driver is set.
+Before do
   if Capybara.current_driver == :rack_test
     DatabaseFlusher[:active_record].strategy = :transaction
   else
     DatabaseFlusher[:active_record].strategy = :deletion
   end
-  DatabaseFlusher.cleaning(&block)
+  DatabaseFlusher.start
+end
+
+# Use Around hook to make sure it runs after capybara session reset.
+Around do |scenario, block|
+  begin
+    block.call
+  ensure
+    DatabaseFlusher.clean
+  end
 end
 ```
 

data/lib/database_flusher/active_record/deletion_strategy.rb

@@ -10,16 +10,31 @@ module DatabaseFlusher
       attr_reader :tables
 
       class Subscriber
+        # INSERT [IGNORE] [INTO] schema_name.table_name
+        PATTERN = %r{
+          \A\s*
+          INSERT
+          (?:\s+IGNORE)?
+          (?:\s+INTO)?
+          \s+
+          (?:[`"]?([^.\s`"]+)[`"]?\.)? # schema
+          (?:[`"]?([^.\s`"]+)[`"]?)    # table
+        }xi
+
         def initialize(strategy)
           @strategy = strategy
         end
 
         def call(_, _, _, _, payload)
           sql = payload[:sql]
-          match = sql.match(/\A\s*INSERT(?:\s+IGNORE)?(?:\s+INTO)?\s+(?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
+          match = sql.match(PATTERN)
           return unless match
-          table = match[1]
+          table  = match[2]
           if table
+            schema = match[1]
+            if schema
+              table = "#{schema}.#{table}"
+            end
             @strategy.tables << table
           end
         end

data/lib/database_flusher/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DatabaseFlusher
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_flusher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Edgars Beigarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: super-fast database cleaner