database_rewinder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a320ff26da5261aed00fc4f589dfd7dd5abe1b1c
-  data.tar.gz: c9eb8839e2e6e55f4aa29b25cce186d87c85f9b0
+  metadata.gz: 1db1d33a8c34c0c729cda2c399f9572fa9517154
+  data.tar.gz: 95bc85096e0150ef5260931297b9461b0a9e65f2
 SHA512:
-  metadata.gz: 6c4e5a25f62290d2d81371992dcb24a9ce53618aad34e6422de624d3546b66a147d51d99773bab834fe1f0fa8aa97f622e3246147b4cba920069dc1bce8eb2ed
-  data.tar.gz: b593b6f822542fd18404308b5bbaac2489063b2038b5f43d039298b81be7451fbf654663bfe32d1721a226fd606b6e4851b4b6298e429053fe4f36941513cc3e
+  metadata.gz: db16fa1ceed189ce34db7f1c54a335014635614069d04d66e44836a18275e68d325de537d4205c86bf24dc1620b3764f5b21b14f49f9f614894781d83ba8d9b5
+  data.tar.gz: ba26cdae5c9433f37726c95e4d103e534f767ad3ce257f4752094716adb843171c7a803ae8f922ed1ddd2c0a0387a1de0ecb30699d68823b42f6473874fb6d5f

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

data/lib/database_rewinder/cleaner.rb

@@ -49,10 +49,10 @@ module DatabaseRewinder
       tables -= @except if @except.any?
       return if tables.empty?
 
-      ar_conn.disable_referential_integrity do
-        if ar_conn.supports_multiple_statements?
-          ar_conn.execute_multiple tables.map {|t| "DELETE FROM #{ar_conn.quote_table_name(t)}"}.join(';')
-        else
+      if tables.many? && ar_conn.supports_multiple_statements?
+        ar_conn.execute_multiple tables.map {|t| "DELETE FROM #{ar_conn.quote_table_name(t)}"}.join(';')
+      else
+        ar_conn.disable_referential_integrity do
           tables.each do |table_name|
             ar_conn.execute "DELETE FROM #{ar_conn.quote_table_name(table_name)};"
           end

data/lib/database_rewinder/multiple_statements_executor.rb

@@ -11,33 +11,37 @@ module DatabaseRewinder
         #TODO Use ADAPTER_NAME when we've dropped AR 4.1 support
         case self.class.name
         when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-          log(sql) { @connection.exec sql }
+          disable_referential_integrity { log(sql) { @connection.exec sql } }
         when 'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
           query_options = @connection.query_options.dup
           if query_options[:connect_flags] & Mysql2::Client::MULTI_STATEMENTS != 0
-            result = log(sql) { @connection.query sql }
-            while @connection.next_result
-              # just to make sure that all queries are finished
-              result = @connection.store_result
+            disable_referential_integrity do
+              _result = log(sql) { @connection.query sql }
+              while @connection.next_result
+                # just to make sure that all queries are finished
+                _result = @connection.store_result
+              end
             end
           else
             query_options[:connect_flags] |= Mysql2::Client::MULTI_STATEMENTS
             # opens another connection to the DB
             client = Mysql2::Client.new query_options
             begin
-              result = log(sql) { client.query sql }
+              # disable_referential_integrity
+              client.query("SET FOREIGN_KEY_CHECKS = 0")
+              _result = log(sql) { client.query sql }
               while client.next_result
                 # just to make sure that all queries are finished
-                result = client.store_result
+                _result = client.store_result
               end
             ensure
               client.close
             end
           end
         when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter'
-          log(sql) { @connection.execute_batch sql }
+          disable_referential_integrity { log(sql) { @connection.execute_batch sql } }
         else
-          execute sql
+          raise 'Multiple deletion is not supported with the current database adapter.'
         end
       end
     end

data/test/database_rewinder_test.rb

@@ -113,8 +113,8 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
   end
 
   test '.clean' do
-    Foo.create! name: 'foo1'
-    Bar.create! name: 'bar1'
+    bar = Bar.create! name: 'bar1'
+    Foo.create! name: 'foo1', bar_id: bar.id
     DatabaseRewinder.clean
 
     assert_equal 0, Foo.count

data/test/fake_app.rb

@@ -32,8 +32,8 @@ end
 class CreateAllTables < ActiveRecord::Migration
   def self.up
     ActiveRecord::Base.establish_connection ENV['DB'].to_sym
-    create_table(:foos) {|t| t.string :name }
     create_table(:bars) {|t| t.string :name }
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner