junk_drawer 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb074cd886fb860ab99a8fef9fcd1b2437a082c3a14a924f1df363a2f2616523
-  data.tar.gz: dd1ea2729b10fa222cc49b7f3a73a7739bf6f1809713310f3df42fdb7eb9162b
+  metadata.gz: 0c6c83cf79e05c396bb79b921f707158a7db5b44c6c7c972857dad6ac3d6ded9
+  data.tar.gz: 3e7e3e5963290cb546077247ae75127c874db5c5919f6f3d442742534f9296ce
 SHA512:
-  metadata.gz: a21e6187ae652a1e7e3696cd5012f1bc4acf0c6af3f46e2782280b89d9a6aad4712aa33c83fe6396358d7a0743ad7c2c31fdeaef0c220517ce7955a253b72c58
-  data.tar.gz: 10c8f9997ef835f4dfb318ed9f9e7de52e357732d97e5165ccb0bfc4307228f16f1aaff878edbfa1e73dc88268344e6c83f721da6873383b176038965117e49f
+  metadata.gz: 1f620a67291b5ac9b00e668957f07d53c54b24c697572601ca0f1a658349c3076327d7da8fd629957efdecacd964c2ebf6f67780ed859401d73e1f4879ea9913
+  data.tar.gz: '045990f101c41347bc05e638c4199b5ef308dd7f9a8dbd7abae4f3581a7a3c250594daf82186c3fb4bbd16ca1e3ee09c96c2ab868bec030cde10f589c1e97768'

data/lib/junk_drawer/rails/bulk_updatable.rb

@@ -25,11 +25,11 @@ module JunkDrawer
     def build_and_exec_prepared_query(objects)
       unique_objects = uniquify_and_merge(objects)
       changed_attributes = extract_changed_attributes(unique_objects)
-      changed_attributes.unshift('id')
+      attributes = ['id'] + changed_attributes
 
-      unique_objects.each_slice(batch_size(changed_attributes)) do |batch|
-        query = build_prepared_query_for(batch, changed_attributes)
-        values = values_for_objects(batch, changed_attributes)
+      unique_objects.each_slice(batch_size(attributes)) do |batch|
+        query = build_prepared_query_for(batch, attributes, changed_attributes)
+        values = values_for_objects(batch, attributes)
         connection.exec_query(query, "#{name} Bulk Update", values, prepare: true)
       end
     end
@@ -66,12 +66,12 @@ module JunkDrawer
 
     def build_unprepared_query_for(objects, attributes)
       object_values = objects.map { |object| sanitized_values(object, attributes) }
-      build_query_for(attributes.unshift('id'), object_values.join(', '))
+      build_query_for(attributes, object_values.join(', '))
     end
 
-    def build_prepared_query_for(objects, attributes)
+    def build_prepared_query_for(objects, attributes, changed_attributes)
       object_placeholders = build_placeholders(objects, attributes)
-      build_query_for(attributes, object_placeholders)
+      build_query_for(changed_attributes, object_placeholders)
     end
 
     def build_query_for(attributes, values)
@@ -83,7 +83,7 @@ module JunkDrawer
       "UPDATE #{table_name} " \
       "SET #{assignment_query} " \
       "FROM (VALUES #{values}) " \
-      "AS tmp_table(#{attributes.join(', ')}) " \
+      "AS tmp_table(id, #{attributes.join(', ')}) " \
       "WHERE #{table_name}.id = tmp_table.id"
     end
 

data/lib/junk_drawer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JunkDrawer
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junk_drawer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard