each_record primary_key fix

Author: dmitrii.buk

Gemfile.lock

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

lib/umbrellio_utils/database.rb

@@ -25,7 +25,7 @@ def get_violated_constraint_name(exception)
     def each_record(dataset, primary_key: nil, **options, &block)
       primary_key = primary_key_from(dataset, primary_key:)
 
-      with_temp_table(dataset, **options) do |ids|
+      with_temp_table(dataset, primary_key:, **options) do |ids|
         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

lib/umbrellio_utils/version.rb

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

spec/support/database.rb

@@ -23,6 +23,12 @@
   column :email, :text
 end
 
+DB.drop_table? :users_without_pk
+DB.create_table :users_without_pk do
+  column :id, :integer
+  column :email, :text
+end
+
 DB.drop_table? :complex_users
 DB.create_table :complex_users do
   column :geo, :text
@@ -37,6 +43,12 @@ def skip_table_sync?
   end
 end
 
+class UserWithoutPk < Sequel::Model(:users_without_pk)
+  def skip_table_sync?
+    false
+  end
+end
+
 class ComplexUser < Sequel::Model(:complex_users)
   def skip_table_sync?
     false

spec/umbrellio_utils/database_spec.rb

@@ -136,6 +136,31 @@
       end
     end
 
+    context "when primary key does not exist in table" do
+      before do
+        UserWithoutPk.multi_insert(users_data)
+      end
+
+      let(:users_data) do
+        Array.new(10) { |index| Hash[id: index + 1, email: "user#{index + 1}@email.com"] }
+      end
+      let(:options) { Hash[primary_key: :id] }
+
+      subject(:result_emails) do
+        users = []
+
+        described_class.each_record(UserWithoutPk.dataset, **options) do |user|
+          users << user
+        end
+
+        users.map(&:email)
+      end
+
+      it "runs correctly with explicit primary_key param" do
+        expect(result_emails).to eq(reversed_emails)
+      end
+    end
+
     context "some invalid option provided" do
       let(:options) { Hash[invalid: 1] }