junk_drawer 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb074cd886fb860ab99a8fef9fcd1b2437a082c3a14a924f1df363a2f2616523
-  data.tar.gz: dd1ea2729b10fa222cc49b7f3a73a7739bf6f1809713310f3df42fdb7eb9162b
+  metadata.gz: af0c9f7f4aa7cd06e4d7f6aafb47263111d60d8039f2da8abc3a479d572a7d2a
+  data.tar.gz: a3b3420460631eb69b70771f4057cf3ed9980a41fb17aeda4a1cd8ec59d6e708
 SHA512:
-  metadata.gz: a21e6187ae652a1e7e3696cd5012f1bc4acf0c6af3f46e2782280b89d9a6aad4712aa33c83fe6396358d7a0743ad7c2c31fdeaef0c220517ce7955a253b72c58
-  data.tar.gz: 10c8f9997ef835f4dfb318ed9f9e7de52e357732d97e5165ccb0bfc4307228f16f1aaff878edbfa1e73dc88268344e6c83f721da6873383b176038965117e49f
+  metadata.gz: a6fc9b47023c4e1ee539191ec8862cbf982b62fb4a4e3f13dc9966d42bb00e20aa560858855deb6735bec907bcf61eefbbe7de35865451d0cd8724ad569ee2e6
+  data.tar.gz: eca53a28e48bd935474769d0cf5f56123caa2853f4ec8fb83f08b444a7f2d975b1f6aec9a33df058bb81d33a1a31e087e885ccefff03da329d7b03f406eb2ee6

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)
+        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.1'
 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.1
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard