database_rewinder 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95027bd40b3b8d879effcf6483f2c5406f2e9e25
-  data.tar.gz: 08aefc2ce25711d7fb0839de87622804e8e3fbc9
+  metadata.gz: a320ff26da5261aed00fc4f589dfd7dd5abe1b1c
+  data.tar.gz: c9eb8839e2e6e55f4aa29b25cce186d87c85f9b0
 SHA512:
-  metadata.gz: f8b1ea85af1d3314b99dbd57574553ac7c315ec60af4663581c876611f8a7a3bc7f9051f5664bb7ed6f42c8827b6f5cc682f893afdb4edd84d18a21848ee62c3
-  data.tar.gz: c0aaa34d77f91e33b23d96b40b42b54528d1313502958e9fc7b31bc3e7b93c76e30540f584ac4f1594059627a8b08e94fcac004653d88e661ab83592b6ae2270
+  metadata.gz: 6c4e5a25f62290d2d81371992dcb24a9ce53618aad34e6422de624d3546b66a147d51d99773bab834fe1f0fa8aa97f622e3246147b4cba920069dc1bce8eb2ed
+  data.tar.gz: b593b6f822542fd18404308b5bbaac2489063b2038b5f43d039298b81be7451fbf654663bfe32d1721a226fd606b6e4851b4b6298e429053fe4f36941513cc3e

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 
+env:
+  - DB=sqlite3
+  - DB=mysql
+  - DB=postgresql
+
 rvm:
   - 2.0.0
   - 2.1.10
@@ -7,7 +12,6 @@ rvm:
   - 2.3.1
 
 gemfile:
-  - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
   - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in database_rewinder.gemspec

data/README.md

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

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler'
 require 'bundler/setup'
 require "bundler/gem_tasks"

data/database_rewinder.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.6.5'
+  spec.version       = '0.7.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"
@@ -22,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'pg'
 end

data/gemfiles/rails_40.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
+gem 'mysql2', '~> 0.3.10'
 
 gemspec path: '../'

data/gemfiles/rails_41.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
+gem 'mysql2', '~> 0.3.13'
 
 gemspec path: '../'

data/lib/database_rewinder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'database_rewinder/cleaner'
 
 module DatabaseRewinder

data/lib/database_rewinder/active_record_monkey.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DatabaseRewinder
   module InsertRecorder
     def execute(sql, *)

data/lib/database_rewinder/cleaner.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+require_relative 'multiple_statements_executor'
+
+using DatabaseRewinder::MultipleStatementsExecutor
+
 module DatabaseRewinder
   class Cleaner
     attr_accessor :config, :connection_name, :only, :except, :inserted_tables, :pool
@@ -45,8 +50,12 @@ module DatabaseRewinder
       return if tables.empty?
 
       ar_conn.disable_referential_integrity do
-        tables.each do |table_name|
-          ar_conn.execute "DELETE FROM #{ar_conn.quote_table_name(table_name)};"
+        if ar_conn.supports_multiple_statements?
+          ar_conn.execute_multiple tables.map {|t| "DELETE FROM #{ar_conn.quote_table_name(t)}"}.join(';')
+        else
+          tables.each do |table_name|
+            ar_conn.execute "DELETE FROM #{ar_conn.quote_table_name(table_name)};"
+          end
         end
       end
     end

data/lib/database_rewinder/compatibility.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DatabaseRewinder
   module Compatibility
     def clean_with(*args)

data/lib/database_rewinder/dummy_model.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DatabaseRewinder
   class DummyModel < ActiveRecord::Base
     class << self

data/lib/database_rewinder/multiple_statements_executor.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module DatabaseRewinder
+  module MultipleStatementsExecutor
+    refine ActiveRecord::ConnectionAdapters::AbstractAdapter do
+      def supports_multiple_statements?
+        #TODO Use ADAPTER_NAME when we've dropped AR 4.1 support
+        %w(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter ActiveRecord::ConnectionAdapters::Mysql2Adapter ActiveRecord::ConnectionAdapters::SQLite3Adapter).include? self.class.name
+      end
+
+      def execute_multiple(sql)
+        #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 }
+        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
+            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 }
+              while client.next_result
+                # just to make sure that all queries are finished
+                result = client.store_result
+              end
+            ensure
+              client.close
+            end
+          end
+        when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter'
+          log(sql) { @connection.execute_batch sql }
+        else
+          execute sql
+        end
+      end
+    end
+  end
+end

data/lib/database_rewinder/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DatabaseRewinder
   class Railtie < ::Rails::Railtie
     initializer 'database_rewinder', after: 'active_record.initialize_database' do

data/test/active_record_monkey_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DatabaseRewinder::InsertRecorderTest < ActiveSupport::TestCase
@@ -9,7 +10,7 @@ class DatabaseRewinder::InsertRecorderTest < ActiveSupport::TestCase
   end
 
   test '#execute' do
-    cleaner = DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == 'test.sqlite3'}
+    cleaner = DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == (ENV['DB'] == 'sqlite3' ? 'database_rewinder_test.sqlite3' : 'database_rewinder_test')}
 
     assert_equal %w(foos bars), cleaner.inserted_tables
     assert_not_nil cleaner.pool

data/test/cleaner_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DatabaseRewinder::CleanerTest < ActiveSupport::TestCase

data/test/config/database.yml

@@ -1,11 +1,45 @@
-test:
+sqlite3: &sqlite3
   adapter: sqlite3
-  database: test.sqlite3
+  database: database_rewinder_test.sqlite3
   pool: 5
   timeout: 5000
 
-test2:
+sqlite3_2: &sqlite3_2
   adapter: sqlite3
-  database: test2.sqlite3
+  database: database_rewinder_test2.sqlite3
   pool: 5
   timeout: 5000
+
+mysql: &mysql
+  adapter: mysql2
+  host: localhost
+  username: root
+  password:
+  database: database_rewinder_test
+
+mysql_2: &mysql_2
+  adapter: mysql2
+  host: localhost
+  username: root
+  password:
+  database: database_rewinder_test2
+
+postgresql: &postgresql
+  adapter: postgresql
+  host: localhost
+  username: postgres
+  password:
+  database: database_rewinder_test
+
+postgresql_2: &postgresql_2
+  adapter: postgresql
+  host: localhost
+  username: postgres
+  password:
+  database: database_rewinder_test2
+
+test:
+  <<: *<%= ENV['DB'] %>
+
+test2:
+  <<: *<%= "#{ENV['DB']}_2" %>

data/test/database_rewinder_test.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
+  if ActiveRecord::VERSION::STRING >= '5'
+    self.use_transactional_tests = false
+  else
+    self.use_transactional_fixtures = false
+  end
+
   setup do
     DatabaseRewinder.init
   end
@@ -10,22 +17,31 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
       DatabaseRewinder.database_configuration = nil
     end
     sub_test_case 'for connecting to an arbitrary database' do
+      def assert_cleaners_added(cleaner_names)
+        connection_names =  DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name}
+        yield
+        assert_equal cleaner_names, DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name} - connection_names
+      end
+
       test 'simply giving a connection name only' do
-        DatabaseRewinder.database_configuration = {'aaa' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
-        DatabaseRewinder['aaa']
-        assert_equal ['aaa'], DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name}
+        assert_cleaners_added ['aaa'] do
+          DatabaseRewinder.database_configuration = {'aaa' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder['aaa']
+        end
       end
 
       test 'giving a connection name via Hash with :connection key' do
-        DatabaseRewinder.database_configuration = {'bbb' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
-        DatabaseRewinder[connection: 'bbb']
-        assert_equal ['bbb'], DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name}
+        assert_cleaners_added ['bbb'] do
+          DatabaseRewinder.database_configuration = {'bbb' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder[connection: 'bbb']
+        end
       end
 
       test 'the Cleaner compatible syntax' do
-        DatabaseRewinder.database_configuration = {'ccc' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
-        DatabaseRewinder[:aho, connection: 'ccc']
-        assert_equal ['ccc'], DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name}
+        assert_cleaners_added ['ccc'] do
+          DatabaseRewinder.database_configuration = {'ccc' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder[:aho, connection: 'ccc']
+        end
       end
     end
 
@@ -45,11 +61,14 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
   end
 
   sub_test_case '.record_inserted_table' do
+    setup do
+      DatabaseRewinder.cleaners
+    end
+
     def perform_insert(sql)
-      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => 'test_record_inserted_table.sqlite3'}}
-      @cleaner = DatabaseRewinder.create_cleaner 'foo'
+      @cleaner = DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == (ENV['DB'] == 'sqlite3' ? 'database_rewinder_test.sqlite3' : 'database_rewinder_test')}
 
-      connection = ::ActiveRecord::Base.sqlite3_connection(adapter: "sqlite3", database: File.expand_path('test_record_inserted_table.sqlite3', Rails.root))
+      connection = ::ActiveRecord::Base.connection
       DatabaseRewinder.record_inserted_table(connection, sql)
     end
     teardown do
@@ -103,18 +122,18 @@ class DatabaseRewinder::DatabaseRewinderTest < ActiveSupport::TestCase
   end
 
   if ActiveRecord::VERSION::STRING >= '4'
-    test '.clean_all should not touch AR::SchemaMigration' do
-      begin
-        ActiveRecord::SchemaMigration.create_table
-        ActiveRecord::SchemaMigration.create! version: '001'
-        Foo.create! name: 'foo1'
-        DatabaseRewinder.clean_all
-
-        assert_equal 0, Foo.count
-        assert_equal 1, ActiveRecord::SchemaMigration.count
-
-      ensure
-        ActiveRecord::SchemaMigration.drop_table
+    sub_test_case 'migrations' do
+      test '.clean_all should not touch AR::SchemaMigration' do
+        begin
+          ActiveRecord::Base.connection.initialize_schema_migrations_table
+          ActiveRecord::SchemaMigration.create! version: '001'
+          DatabaseRewinder.clean_all
+
+          assert_equal 0, Foo.count
+          assert_equal 1, ActiveRecord::SchemaMigration.count
+        ensure
+          ActiveRecord::SchemaMigration.drop_table
+        end
       end
     end
   end

data/test/fake_app.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
+ENV['DB'] ||= 'sqlite3'
 require 'active_record/railtie'
+load 'active_record/railties/databases.rake'
 
 module DatabaseRewinderTestApp
   Application = Class.new(Rails::Application) do
@@ -10,25 +14,31 @@ module DatabaseRewinderTestApp
   end.initialize!
 end
 
+require 'active_record/base'
+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"
 
 # models
 class Foo < ActiveRecord::Base; end
 class Bar < ActiveRecord::Base; end
 class Baz < ActiveRecord::Base; end
 class Quu < ActiveRecord::Base
-  establish_connection :test2
+  establish_connection "#{ENV['DB']}_2".to_sym
 end
 
 # migrations
 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(:bazs) {|t| t.string :name }
 
-    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
+    test2_connection = ActiveRecord::Base.establish_connection("#{ENV['DB']}_2".to_sym).connection
     test2_connection.create_table(:quus) {|t| t.string :name }
-    ActiveRecord::Base.establish_connection :test
+    ActiveRecord::Base.establish_connection ENV['DB'].to_sym
   end
 
   def self.down
@@ -36,8 +46,8 @@ class CreateAllTables < ActiveRecord::Migration
     drop_table(:bars) {|t| t.string :name }
     drop_table(:bazs) {|t| t.string :name }
 
-    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
+    test2_connection = ActiveRecord::Base.establish_connection("#{ENV['DB']}_2".to_sym).connection
     test2_connection.drop_table :quus
-    ActiveRecord::Base.establish_connection :test
+    ActiveRecord::Base.establish_connection ENV['DB'].to_sym
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV['RAILS_ENV'] ||= 'test'
 
 $LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: pg
+  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
 email:
 - ronnie@dio.jp
@@ -94,7 +122,6 @@ files:
 - README.md
 - Rakefile
 - database_rewinder.gemspec
-- gemfiles/rails_32.gemfile
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_41.gemfile
 - gemfiles/rails_42.gemfile
@@ -105,6 +132,7 @@ files:
 - lib/database_rewinder/cleaner.rb
 - lib/database_rewinder/compatibility.rb
 - lib/database_rewinder/dummy_model.rb
+- lib/database_rewinder/multiple_statements_executor.rb
 - lib/database_rewinder/railtie.rb
 - test/active_record_monkey_test.rb
 - test/cleaner_test.rb

data/gemfiles/rails_32.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.2.0'
-gem 'test-unit-rails', '1.0.2'
-
-gemspec path: '../'