delete_in_batches 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9334c1787ed0531d63d596f13af0d01497980b50
-  data.tar.gz: efc570b218f5feece5842f12976f544f9cbfe003
+SHA256:
+  metadata.gz: c19c0abdd26b2ea2eea3ef9852d800f29077e7da89ecf3268068d4bc1c9a5032
+  data.tar.gz: cfec1154bed9e3f406bb8fe601676204d6000f9fd569a1111c58e89d55c8953c
 SHA512:
-  metadata.gz: 08496a8fe18729a87919ad9870ed77f9fe355c409fcafc10f6aa827acf5ad8f936408227fea792d9d1e3c9ab1f9ad75f5f0d138f49a0bd59b3ca9b07056f1b47
-  data.tar.gz: d0a79745e4cf3d55a7cc17ea9586a6f1ca6f151a673a63fe6b07e41beb497236e6c3c5404064161a3ac3fd4da19931cab1bed41059c59774239b1c98d1f1f8ac
+  metadata.gz: 5a1f174a03a098551d0542075d4a043ae523d17d3340802d010309c671f05a1a51c98b0ff1aba00adcce48a7715232e123b69a68d2fb3534440368c5fdfadfee
+  data.tar.gz: 198d18d925e870567895eaf3373090b7155d4442c386ab37ad70e18efa4f9c0c5495f8034ad3070c7bf3c5c2a6bfb1c0a16228b7f62b402b7ec3472be4bf6644

data/README.md

@@ -1,6 +1,14 @@
 # delete_in_batches
 
-:fire: The fastest way to delete millions of rows with ActiveRecord
+:fire: The fastest way to delete 100k+ rows with ActiveRecord
+
+**Note: This gem is not needed in Rails 5+.** Instead, you can do:
+
+```ruby
+Tweet.where(user_id: 1).in_batches(of: 10000).delete_all
+```
+
+[![Build Status](https://travis-ci.org/ankane/delete_in_batches.svg?branch=master)](https://travis-ci.org/ankane/delete_in_batches)
 
 ## Slow
 

data/lib/delete_in_batches.rb

@@ -2,27 +2,21 @@ require "delete_in_batches/version"
 require "active_record"
 
 module DeleteInBatches
-
-  def delete_in_batches(options = {}, &block)
+  def delete_in_batches(options = {})
     batch_size = options[:batch_size] || 10000
 
-    # TODO dry
-    pk = "#{quoted_table_name}.#{quoted_primary_key}"
-    sql =
-      if connection.respond_to?(:unprepared_statement)
-        # ActiveRecord 4
-        connection.unprepared_statement do
-          select(pk).limit(batch_size).to_sql
-        end
-      else
-        select(pk).limit(batch_size).to_sql
-      end
+    pk       = "#{quoted_table_name}.#{quoted_primary_key}"
+    sql_proc = proc { select(pk).limit(batch_size).to_sql }
+    sql      = connection.try(:unprepared_statement, &sql_proc) || sql_proc.call
+
+    if %w(MySQL Mysql2 Mysql2Spatial).include?(connection.adapter_name)
+      sql = "SELECT * FROM (#{sql}) AS t"
+    end
 
     while connection.delete("DELETE FROM #{quoted_table_name} WHERE #{pk} IN (#{sql})") == batch_size
       yield if block_given?
     end
   end
-
 end
 
 ActiveRecord::Base.send :extend, DeleteInBatches

data/lib/delete_in_batches/version.rb

@@ -1,3 +1,3 @@
 module DeleteInBatches
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delete_in_batches
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,18 +56,18 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,23 +80,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The fastest way to delete millions of rows with ActiveRecord
-email:
-- andrew@chartkick.com
+description: 
+email: andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- delete_in_batches.gemspec
 - lib/delete_in_batches.rb
 - lib/delete_in_batches/version.rb
-- test/delete_in_batches_test.rb
-- test/test_helper.rb
 homepage: https://github.com/ankane/delete_in_batches
 licenses:
 - MIT
@@ -109,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,10 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: The fastest way to delete millions of rows with ActiveRecord
-test_files:
-- test/delete_in_batches_test.rb
-- test/test_helper.rb
+summary: The fastest way to delete 100k+ rows with ActiveRecord
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in delete_in_batches.gemspec
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-task :default => :test
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-end

data/delete_in_batches.gemspec

@@ -1,27 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'delete_in_batches/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "delete_in_batches"
-  spec.version       = DeleteInBatches::VERSION
-  spec.authors       = ["Andrew Kane"]
-  spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{The fastest way to delete millions of rows with ActiveRecord}
-  spec.description   = %q{The fastest way to delete millions of rows with ActiveRecord}
-  spec.homepage      = "https://github.com/ankane/delete_in_batches"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activerecord"
-
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 4.7"
-  spec.add_development_dependency "pg"
-end

data/test/delete_in_batches_test.rb

@@ -1,55 +0,0 @@
-require_relative "test_helper"
-
-class TestDeleteInBatches < Minitest::Unit::TestCase
-
-  def test_basic
-    10.times do
-      Tweet.create(user_id: 1)
-    end
-    Tweet.create(user_id: 2)
-
-    Tweet.where(user_id: 1).delete_in_batches(batch_size: 2)
-
-    assert_equal 1, Tweet.count
-    assert_equal 2, Tweet.first.user_id
-  end
-
-  def test_all
-    Tweet.create(user_id: 1)
-
-    Tweet.delete_in_batches
-
-    assert_equal 0, Tweet.count
-  end
-
-  def test_progress
-    10.times do
-      Tweet.create(user_id: 1)
-    end
-
-    i = 0
-    Tweet.where(user_id: 1).delete_in_batches(batch_size: 2) do
-      i += 1
-    end
-
-    assert_equal 5, i
-  end
-
-  def test_association
-    user = User.create!
-    user.tweets.create!
-
-    user.tweets.delete_in_batches
-
-    assert_equal 0, user.tweets.count
-  end
-
-  def test_join
-    Tweet.create(user_id: 1)
-
-    Tweet.joins(:user).where(users: {id: 1}).delete_in_batches
-
-    assert_equal 0, Tweet.count
-  end
-
-end

data/test/test_helper.rb

@@ -1,31 +0,0 @@
-require "bundler/setup"
-Bundler.require(:default)
-require "minitest/autorun"
-require "minitest/pride"
-
-ENV["RACK_ENV"] = "test"
-
-# for debugging
-# ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-# rails does this in activerecord/lib/active_record/railtie.rb
-ActiveRecord::Base.default_timezone = :utc
-ActiveRecord::Base.time_zone_aware_attributes = true
-
-# migrations
-ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "delete_in_batches_test"
-
-ActiveRecord::Migration.create_table :tweets, :force => true do |t|
-  t.integer :user_id
-end
-
-ActiveRecord::Migration.create_table :users, :force => true do |t|
-end
-
-class Tweet < ActiveRecord::Base
-  belongs_to :user
-end
-
-class User < ActiveRecord::Base
-  has_many :tweets
-end