ar-ondemand 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDYxMjI1MWU0YTFkNmI1YzBkYTY1NWI2OTY0OWM4YThiMmZjODhkMw==
+    NzFmMGZjYTQyODc2ZDY5ZGFiNzUxYTYyYTVlYzc4ZGZhNGFiMjIwZg==
   data.tar.gz: !binary |-
-    M2JkMTFjZmExNWVhZDUyNzc0ODRhNDM5N2VlYjJlMGM2YmJkNzUwZg==
+    MDc4YWY1NjE1YzdhMjM0Njg4NjEyNjgzN2VhNzg5ODdiN2JlZDIxYg==
 SHA512:
   metadata.gz: !binary |-
-    OGJmYTJlZGI1N2UzOTUyYTUzMWNmOGJjYmZkYTMxYTUzNWYwMzM0NzFiNDUw
-    ODBhNzM5ODZmNWNhNWFkNzNiNTc5NzQyNTU3OTk2MmU3NTMyZTkwYzQzNWE1
-    NGRjNzg5Mzc3YTE1NjUwMmE4MWM5MzYzZWNkNjU5OTA0ZjcwYjc=
+    NDFhMTAxMWY5OTc5OTEwODRiMzY2MjI1MTg2Y2FhOWZjODRhMTJiOGU0ZjRi
+    MTgzOGM4OTQzOTBkNjM4ZTM3ZDdlZDk2NWYwYjA0NTY0ZjMzNDE0NjY5MzA4
+    NDJlNDAwOTU2YjA5OWEyNTc3MWU1MGZkYjljNjk4YmRmZDBiMGM=
   data.tar.gz: !binary |-
-    NzY5NjMwZTA2NDU3ODZhZTY4ODg4MzkxYmJmMzlhZjc0ZTIxYWExYjlhYmFj
-    YzkyZTlmMTJkMDJjMTdlMjE1MTY0NTgwMmQ1OTc4MGNhMDA5YzgzZGM2MjFi
-    MDhmNTE5NDkxZTI5Yzc0MTM5NTJjZGRkOThkOWNjNGNlYTdmM2E=
+    NzM3YWMyMDM5ZjdiM2Q1ZjhjZjMwMDk2MmJmY2I0ZTkzNTZkZjcxODYzOGFk
+    MjAzZDk2MjFlZWQyMWFkNTc0ZmY2NmM2ZWIzOTI3ZjY3YzJjZTU4ZjQwOWYz
+    ZmI3YTA2OTcyODI1ZmEzZjgyNTM0NjlhMzE2ZDgxMzI4NjY1NGE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar-ondemand (1.0.1)
+    ar-ondemand (1.0.5)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
 

data/lib/ar-ondemand/delete_all_by_pk.rb

@@ -5,7 +5,8 @@ module ActiveRecord
     module DeleteAllByPkExtension
       extend ::ActiveSupport::Concern
 
-      # Ripped from the find_in_batches function, but customized to return an ::ActiveRecord::OnDemand::ResultSet
+      # Use this instead of delete_all to perform a delete using the PK of the table, which prevents a complete table scan that locks it
+      # Based on find_in_batches function
       def delete_all_by_pk(options = {})
         relation = self
 
@@ -25,17 +26,20 @@ module ActiveRecord
 
         relation = relation.reorder(batch_order_delete_all_by_pk).limit(batch_size) if batch_size
         records = query_delete_all_by_pk(start ? relation.where(table[primary_key].gteq(start)) : relation)
+        deleted = 0
 
         while records.any?
           records_size = records.size
           primary_key_offset = records.last
 
-          self.unscoped.where(id: records).delete_all
+          deleted += self.unscoped.where(id: records).delete_all
 
           break if batch_size.nil? || records_size < batch_size
 
           records = query_delete_all_by_pk relation.where(table[primary_key].gt(primary_key_offset))
         end
+
+        deleted
       end
 
       private

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Steve Frank