delete_in_batches 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63cc69d5539bdab7a0cbc60bf015049ca8ce729
-  data.tar.gz: 6f213288c1f9a52666af9d9cb01b5ec615ad02ee
+  metadata.gz: 9334c1787ed0531d63d596f13af0d01497980b50
+  data.tar.gz: efc570b218f5feece5842f12976f544f9cbfe003
 SHA512:
-  metadata.gz: b9a00e37f6272dff4674fcbbbaea290b8c047265a51718c07fce8bf2ca5584288341db59b377fe5be3132b3fd0aeef85a1ad05487f86a2f4fcd4071dc6db29d2
-  data.tar.gz: a02e0da81efae6cb1d4782a4401b83d9133bb3253e3d96e4f817e34834e4168ad4ac67f5eb54bfc28673433b25e01cbd91da406a20e3727d9258ecd502be0df0
+  metadata.gz: 08496a8fe18729a87919ad9870ed77f9fe355c409fcafc10f6aa827acf5ad8f936408227fea792d9d1e3c9ab1f9ad75f5f0d138f49a0bd59b3ca9b07056f1b47
+  data.tar.gz: d0a79745e4cf3d55a7cc17ea9586a6f1ca6f151a673a63fe6b07e41beb497236e6c3c5404064161a3ac3fd4da19931cab1bed41059c59774239b1c98d1f1f8ac

data/Rakefile

@@ -1 +1,8 @@
 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

@@ -18,6 +18,10 @@ Gem::Specification.new do |spec|
   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/lib/delete_in_batches.rb

@@ -1,4 +1,5 @@
 require "delete_in_batches/version"
+require "active_record"
 
 module DeleteInBatches
 
@@ -6,17 +7,18 @@ module DeleteInBatches
     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(:id).limit(batch_size).to_sql
+          select(pk).limit(batch_size).to_sql
         end
       else
-        select(:id).limit(batch_size).to_sql
+        select(pk).limit(batch_size).to_sql
       end
 
-    while connection.delete("DELETE FROM #{table_name} WHERE id IN (#{sql})") == batch_size
+    while connection.delete("DELETE FROM #{quoted_table_name} WHERE #{pk} IN (#{sql})") == batch_size
       yield if block_given?
     end
   end

data/lib/delete_in_batches/version.rb

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

data/test/delete_in_batches_test.rb

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,31 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delete_in_batches
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !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: The fastest way to delete millions of rows with ActiveRecord
 email:
 - andrew@chartkick.com
@@ -53,6 +95,8 @@ files:
 - 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
@@ -77,4 +121,6 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The fastest way to delete millions of rows with ActiveRecord
-test_files: []
+test_files:
+- test/delete_in_batches_test.rb
+- test/test_helper.rb