bulk_dependency_eraser 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efe5bca3c57d245dc00fcb0d04a57bab5dc9eb19d81e55be43a56e6adb7752c
-  data.tar.gz: b6b2d2bf30e7dd964d5032bd61ed1e57f820bec667dd3435c79567e24d6a0265
+  metadata.gz: 5409fc52fbc918546360e196bd06c0be4837f0aa848af8a99aeed4015219f0e7
+  data.tar.gz: d3818d4f8c8e2a3be0c81c5e3b37bc0295d2e7ca077c08a45e7ae143975f2f3e
 SHA512:
-  metadata.gz: b7981de1665f8c6c7f7c2054c446a09edaa6add210481e091d2034f086eb9703bd619b23de29d03777bb8445b9fc7902329af8ce262204510e0e7695ebe380be
-  data.tar.gz: 42cfbfdb8ad934d9b4d1a806e9da158e82a2ddb2b38cbee790423c5ff046aa3517370f12bd6e5cad00f6ec7db57fb6ee3082bbcb6faefadc866f6332919a6143
+  metadata.gz: 14d334bd9f2baf4008a653c8f19b0544bc32e02e36dea965f6fa08ad3f317ca4e3bff5eb2417aeb70549a54d109341884d87c9af7591c2a258b018d6444d993d
+  data.tar.gz: 1f84b22cd3cfadf48d5450225c4cc3cbd4e3302acf15cd6c357904538b7427631a5d735621b3ecf4e574a31184525d9601630c9fd8c939d9e7f10fea6060e573

data/lib/bulk_dependency_eraser/builder.rb

@@ -192,12 +192,16 @@ module BulkDependencyEraser
         # If the query has a limit, then we don't want to clobber with batching.
         if batching_disabled? || !query.where({}).limit_value.nil?
           # query without batching
-          query_results = query.pluck(*columns)
+          # query_results = query.pluck(*columns)
+          query_results = query.pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
         elsif opts_c.disable_batch_ordering || opts_c.disable_batch_ordering_for_klasses.include?(current_klass_name)
           # query with orderless batching
           offset = 0
           loop do
-            new_query_results = query.offset(offset).limit(batch_size).pluck(*columns)
+            # This use-case didn't work. Rails converts the query filter to a left_outer_join, and can't then pull the CTID column in some use-cases
+            # new_query_results = query.offset(offset).limit(batch_size).pluck(*columns)
+            # This implementation does work. Prevents rails ORM from converting to a join
+            new_query_results = query.offset(offset).limit(batch_size).pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
             query_results += new_query_results
 
             break if new_query_results.size < batch_size
@@ -208,7 +212,8 @@ module BulkDependencyEraser
         else
           # query with ordered batching
           query.in_batches(of: batch_size) do |subset_query|
-            query_results += subset_query.pluck(*columns)
+            # query_results += subset_query.pluck(*columns)
+            query_results += subset_query.pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
           end
         end
       end

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "4.2.2".freeze
+  VERSION = "4.2.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulk_dependency_eraser
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - benjamin.dana.software.dev@gmail.com