umbrellio-utils 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5415ce42c2ba64403bb051b4d1772724226f8f0eb321d7eacae22af3db9961e
-  data.tar.gz: 11f4a31ba535995db43fd3d5f8d180061d494488baf2a7548fa13844ee5b5b53
+  metadata.gz: 72645a52796579230696a94c8da844e4466cd44c50de201e0c878569f9f524d4
+  data.tar.gz: 8d1133ddd2dd1405aa015886316d9096208aa6f155a26dee7e6a537adc26af67
 SHA512:
-  metadata.gz: 715ccd8c42effe71b0be1e8482d8188b8dace23acd7e579b35d3491d4ba0c8d8d77b3e33396c22b034ea6f6199a0983b274828e05ab62ea684bc6ff57d74594b
-  data.tar.gz: d312202f931ee6d070f660f39148aaece7d71f5cca2a68ee31b61f4c5da525950b6702e0cd0f616e126047627aab9d6326641ed6310279c6ffa2e07cae536364
+  metadata.gz: a70e82c15b575921e97ed5f82f23e66cb27753ccc67ebc76128a53c90f46d63b89399f0e55214eea9da7c97653575b888ee70535ab44cd835e374998664991f6
+  data.tar.gz: d6887244a85571acdeee74a0f7c914081f27c751608f41330dbad594a68c69473670fc65c877842f1489cc019b75e6b523c1f34b1bcb236d5d666729e357ee2c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    umbrellio-utils (1.0.0)
+    umbrellio-utils (1.2.0)
       memery (~> 1)
 
 GEM

data/lib/umbrellio_utils/database.rb

@@ -25,7 +25,8 @@ module UmbrellioUtils
       primary_key = primary_key_from(**options)
 
       with_temp_table(dataset, **options) do |ids|
-        dataset.model.where(primary_key => ids).reverse(primary_key).each(&block)
+        rows = ids.map { |id| row(id.is_a?(Hash) ? id.values : [id]) }
+        dataset.model.where(row(primary_key) => rows).reverse(row(primary_key)).each(&block)
       end
     end
 
@@ -39,11 +40,7 @@ module UmbrellioUtils
 
       loop do
         DB.transaction do
-          pk_expr = DB[temp_table_name].select(primary_key).reverse(primary_key).limit(page_size)
-
-          deleted_items = DB[temp_table_name].where(primary_key => pk_expr).returning.delete
-          pk_set = deleted_items.map { |item| item[primary_key] }
-
+          pk_set = pop_next_pk_batch(temp_table_name, primary_key, page_size)
           yield(pk_set) if pk_set.any?
         end
 
@@ -61,18 +58,22 @@ module UmbrellioUtils
       Lamian.logger.send(:logdevs).each { |x| x.truncate(0) && x.rewind }
     end
 
-    def create_temp_table(dataset, primary_key:)
-      model = dataset.model
+    def create_temp_table(dataset, **options)
       time = Time.current
+      model = dataset.model
       temp_table_name = "temp_#{model.table_name}_#{time.to_i}_#{time.nsec}".to_sym
-      type = model.db_schema[primary_key][:db_type]
+      primary_key = primary_key_from(**options)
 
-      DB.drop_table?(temp_table_name)
       DB.create_table(temp_table_name, unlogged: true) do
-        column primary_key, type, primary_key: true
+        primary_key.each do |field|
+          type = model.db_schema[field][:db_type]
+          column field, type
+        end
+
+        primary_key primary_key
       end
 
-      insert_ds = dataset.select(Sequel[model.table_name][primary_key])
+      insert_ds = dataset.select(*qualified_pk(model.table_name, primary_key))
       DB[temp_table_name].disable_insert_returning.insert(insert_ds)
 
       temp_table_name
@@ -80,8 +81,16 @@ module UmbrellioUtils
 
     private
 
+    def row(values)
+      Sequel.function(:row, *values)
+    end
+
     def primary_key_from(**options)
-      options.fetch(:primary_key, :id)
+      Array(options.fetch(:primary_key, :id))
+    end
+
+    def qualified_pk(table_name, primary_key)
+      primary_key.map { |f| Sequel[table_name][f] }
     end
 
     def sleep_interval_from(sleep)
@@ -94,5 +103,15 @@ module UmbrellioUtils
         defined?(Rails) && Rails.env.production? ? 1 : 0
       end
     end
+
+    def pop_next_pk_batch(temp_table_name, primary_key, batch_size)
+      row = row(primary_key)
+      pk_expr = DB[temp_table_name].select(*primary_key).reverse(row).limit(batch_size)
+      deleted_items = DB[temp_table_name].where(row => pk_expr).returning.delete
+      deleted_items.map do |item|
+        next item if primary_key.size > 1
+        item[primary_key.first]
+      end
+    end
   end
 end

data/lib/umbrellio_utils/request_wrapper.rb

@@ -14,6 +14,7 @@ module UmbrellioUtils
     end
 
     memoize def body
+      request.body.rewind
       request.body.read.dup.force_encoding("utf-8")
     end
 

data/lib/umbrellio_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UmbrellioUtils
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Team Umbrellio
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A set of utilities that speed up development