deimos-ruby 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb760f9bdfc09803add56c38f786d3328cf67f797223458bcef0fc396a81661e
-  data.tar.gz: 3ef94bb9b7f94303c82dbfd7728e92bb53e400e4de2f42d1b7c0fab84bed6850
+  metadata.gz: 705269764ba0122cc1eff515eef044d8855b2b050c0e4ad29627c65055da8e66
+  data.tar.gz: 6184e80be2db0d657b47fd2d4a54957b95ce52f3c40eeee0edafa59d7de99c96
 SHA512:
-  metadata.gz: 686616760e7bc0ae6a019885058b8b8446cf4b5ef187d1908c16755ec92fb4efecbd3e63719837fd351c332e9f22c4e5ce46e928b3bd45a10dccb547c5344599
-  data.tar.gz: 29697e83e3fb628b625a9ffd8af5357d2d452bef473d8ce6a9decb6519539be681a1fd49d1c8f17e61c75e277eeb293e9443a4158f0601110f843849f3813d24
+  metadata.gz: 608942a3b72c7f5da730349d19da526582a564f9ffdb66e3c2a3b9bfe63821ce575b87e663aeaf341879fb2887a48927dbae496b8068b61ff6e32e23ca650cdd
+  data.tar.gz: 393aa82894d78399130fd3aed4ae46794dd3879cb6c52f992f4f8e11ff2e1febde69a68f3d9e18b7360c6fd6ab298b823ed69e32ae41231e299e6b96e28eecfc

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 2.5.2 - 2026-04-24
+
+- Fix: `BatchRecordList#fill_primary_keys!` no longer short-circuits on stale in-memory primary keys left over from a rolled-back `DeadlockRetry` attempt, preventing `ActiveRecord::InvalidForeignKey` during association imports.
+
 ## 2.5.1 - 2026-03-18
 
 - Fix: Outbox producer would swallow ActiveRecord errors except for uniqueness.

data/lib/deimos/active_record_consume/batch_record.rb

@@ -16,6 +16,8 @@ module Deimos
       attr_accessor :bulk_import_id
       # @return [String] The column name to use for bulk IDs - defaults to `bulk_import_id`.
       attr_accessor :bulk_import_column
+      # @return [Boolean] true if the primary key was supplied in the input attributes,
+      attr_accessor :primary_key_preset
 
       delegate :valid?, :errors, :send, :attributes, to: :record
 
@@ -32,6 +34,7 @@ module Deimos
         end
         attributes = attributes.with_indifferent_access
         self.record = klass.new(attributes.slice(*klass.column_names))
+        self.primary_key_preset = !self.record[klass.primary_key].nil?
         assoc_keys = attributes.keys.select { |k| klass.reflect_on_association(k) }
         # a hash with just the association keys, removing all actual column information.
         self.associations = attributes.slice(*assoc_keys)

data/lib/deimos/active_record_consume/batch_record_list.rb

@@ -53,7 +53,8 @@ module Deimos
       def fill_primary_keys!
         primary_col = self.klass.primary_key
 
-        return if self.batch_records.empty? || self.batch_records.first.send(primary_col).present?
+        # Skip if nothing to backfill or caller already supplied the PK.
+        return if self.batch_records.empty? || self.batch_records.first.primary_key_preset
 
         bulk_import_map = self.klass.
           where(self.bulk_import_column => self.batch_records.map(&:bulk_import_id)).

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/spec/active_record_consume/mass_updater_spec.rb

@@ -112,6 +112,34 @@ RSpec.describe Deimos::ActiveRecordConsume::MassUpdater do
           expect(Detail.count).to eq(0)
         end
 
+        it 'should refetch parent primary keys when retrying child import' do
+          allow(Widget).to receive(:import!).and_call_original
+          allow(Widget).to receive(:where).and_call_original
+
+          # Deadlock the first child import to trigger DeadlockRetry; let the retry pass through.
+          detail_call_count = 0
+          allow(Detail).to receive(:import!).and_wrap_original do |m, *args|
+            detail_call_count += 1
+            raise ActiveRecord::Deadlocked, 'Lock wait timeout exceeded' if detail_call_count == 1
+
+            m.call(*args)
+          end
+
+          described_class.new(Widget, bulk_import_id_generator: bulk_id_generator).mass_update(batch)
+
+          # Parent ids written by `fill_primary_keys!` during attempt 1 stay in
+          # memory after the DB rollback, so they're stale on retry. Assert the
+          # retry re-queries. Outcome-level checks are unreliable: SQLite reuses
+          # rolled-back ids so stale memory matches coincidentally; MySQL and
+          # Postgres burn auto-increment and surface ActiveRecord::InvalidForeignKey.
+          expect(Widget).to have_received(:where).
+            with(bulk_import_id: [instance_of(String), instance_of(String)]).twice
+          expect(Widget.count).to eq(2)
+          expect(Detail.count).to eq(2)
+          expect(Widget.first.detail).not_to be_nil
+          expect(Widget.last.detail).not_to be_nil
+        end
+
       end
 
       context 'with save_associations_first' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Daniel Orner