umbrellio-utils 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72645a52796579230696a94c8da844e4466cd44c50de201e0c878569f9f524d4
-  data.tar.gz: 8d1133ddd2dd1405aa015886316d9096208aa6f155a26dee7e6a537adc26af67
+  metadata.gz: aaa7935344d41de32a9d61527b1c7b167d64715207422fc23f83d790950e5951
+  data.tar.gz: f9d7707ff893d916462b7e584a08ad8171036825eecacc201eecc09b17fc041f
 SHA512:
-  metadata.gz: a70e82c15b575921e97ed5f82f23e66cb27753ccc67ebc76128a53c90f46d63b89399f0e55214eea9da7c97653575b888ee70535ab44cd835e374998664991f6
-  data.tar.gz: d6887244a85571acdeee74a0f7c914081f27c751608f41330dbad594a68c69473670fc65c877842f1489cc019b75e6b523c1f34b1bcb236d5d666729e357ee2c
+  metadata.gz: 319224d118b8c1197b9d93855aa83dcb8dbe80b33fb9395d8782e24cbdd4e303ce7bea798f33b4940febfa268d4f457dae0aac55d14e43e5933fd60d9d038362
+  data.tar.gz: fb536f209a2190fc064db5b0f3a73b01b9286deceab3b7ee83e7f88cbb0023203737b29444baf218b42402dd5e0ad2f2a0bc60edf92bbf0cfbceb1352c5c0f84

data/Gemfile.lock

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

data/lib/umbrellio_utils/database.rb

@@ -5,6 +5,7 @@ module UmbrellioUtils
     extend self
 
     HandledConstaintError = Class.new(StandardError)
+    InvalidPkError = Class.new(StandardError)
 
     def handle_constraint_error(constraint_name, &block)
       DB.transaction(savepoint: true, &block)
@@ -22,7 +23,7 @@ module UmbrellioUtils
     end
 
     def each_record(dataset, **options, &block)
-      primary_key = primary_key_from(**options)
+      primary_key = primary_key_from(dataset, **options)
 
       with_temp_table(dataset, **options) do |ids|
         rows = ids.map { |id| row(id.is_a?(Hash) ? id.values : [id]) }
@@ -31,7 +32,7 @@ module UmbrellioUtils
     end
 
     def with_temp_table(dataset, page_size: 1_000, sleep: nil, **options)
-      primary_key = primary_key_from(**options)
+      primary_key = primary_key_from(dataset, **options)
       sleep_interval = sleep_interval_from(sleep)
 
       temp_table_name = create_temp_table(dataset, primary_key: primary_key)
@@ -62,7 +63,7 @@ module UmbrellioUtils
       time = Time.current
       model = dataset.model
       temp_table_name = "temp_#{model.table_name}_#{time.to_i}_#{time.nsec}".to_sym
-      primary_key = primary_key_from(**options)
+      primary_key = primary_key_from(dataset, **options)
 
       DB.create_table(temp_table_name, unlogged: true) do
         primary_key.each do |field|
@@ -85,8 +86,14 @@ module UmbrellioUtils
       Sequel.function(:row, *values)
     end
 
-    def primary_key_from(**options)
-      Array(options.fetch(:primary_key, :id))
+    def extract_primary_key(dataset)
+      dataset.db.schema(dataset.first_source).select { |x| x[1][:primary_key] }.map(&:first)
+    end
+
+    def primary_key_from(dataset, **options)
+      Array(options[:primary_key] || extract_primary_key(dataset)).tap do |primary_key|
+        raise InvalidPkError if primary_key.empty?
+      end
     end
 
     def qualified_pk(table_name, primary_key)

data/lib/umbrellio_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Team Umbrellio
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery