inline_forms 8.1.16 → 8.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a523b9082f8bf1ada004984c1d3cc66e745cae0e525e36acbf66df97b7015e98
-  data.tar.gz: d82f9950bde7f293ea70ef2e63162bcb304a0fac44eb6c8f645f88bbefe947da
+  metadata.gz: b7336d7c761e22dd4378a0c2d01b54f7558a2a29d9818a085b4478c17e664ead
+  data.tar.gz: 3e08954932efda044a18cf4f4a68ad3299ffdb382581c9369bc733023ff57906
 SHA512:
-  metadata.gz: 275bec7794f426e5131ae69843dfcb9bd2cec55ae9124075bc59ae0e171fc6df3d406ae776d78526a918a12dbc87aa41b0b12ade138fd4f520d75254570e6b01
-  data.tar.gz: 33bb93de6e2f017d664b610e07105afea73708b5ee67a269b48bd68de6b3d0fa8b9688eab4c21882ea408a8fc7ab68fcf6e2a18ff733d56fad29110e5863790e
+  metadata.gz: 93339e380b5d224fe1b1d3b5459cc6675682ed81bd87f7a28594afafaa9304b50467dc8cb2b628641c78fb39ba68649c02fd9a38b154388815458e51e2781afe
+  data.tar.gz: e33e98b2676db0ec7d0af1196a1bf9be4b423b231d52f9636391fd830fdb29779a6e03381a5150bdde4258374ec13c4ad3b908f55cdd1e3ebf2d03ad86ac2cbc

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [8.1.17] - 2026-05-28
+
+### Fixed
+
+- **`RecordNotUnique` on `photos.id` (and any primary record) when restoring a `destroy` version while the row still exists.** PaperTrail records a non-empty changeset for `destroy` events, so the versions panel shows a Restore link on `destroy` rows. Reverting a `destroy` reifies a record with the original primary key and `new_record? == true`; the normal undo (row currently deleted) path correctly INSERTs it, but once the row had already been restored a blind `save!` re-INSERTed the existing id and raised `SQLite3::ConstraintException: UNIQUE constraint failed: photos.id`. `revert` now upserts the primary record by PK (mirroring the 8.1.16 rich-text fix): when a row with that id already exists, the reified column values are copied onto it and saved in place, so restoring a `destroy` version is idempotent across repeated delete/undo cycles.
+
+### Added
+
+- **Regression test:** restore a Photo `destroy` version while the row still exists (panel Restore / replayed undo) must not raise `RecordNotUnique`.
+
 ## [8.1.16] - 2026-05-28
 
 ### Fixed

data/app/controllers/inline_forms_controller.rb

@@ -318,8 +318,7 @@ class InlineFormsController < ApplicationController
       @rich_text_record.save!
       @parent.touch if @parent.respond_to?(:touch)
     else
-      @parent = @object
-      @parent.save!
+      @parent = persist_reverted_primary!(@object)
       restore_rich_texts_for_reverted_parent!(@parent)
       @parent.reload
     end
@@ -328,6 +327,33 @@ class InlineFormsController < ApplicationController
 
   private
 
+  # Persist a reified *primary* record (Apartment, Photo, ...) for +revert+.
+  #
+  # +reify+ on a +destroy+ version returns a record with +new_record? == true+
+  # carrying the original primary key. The normal undo (row currently deleted)
+  # path INSERTs that id and is correct. But the versions panel also offers
+  # Restore on +destroy+ rows (their changeset is non-empty in apps that track
+  # +object_changes+ on destroy), and the post-delete undo banner can be
+  # replayed. Once the row has been restored, a blind +save!+ re-INSERTs the
+  # existing id and raises +RecordNotUnique+ (SQLite: +UNIQUE constraint failed:
+  # photos.id+). Mirror the rich-text upsert (8.1.16): when a row with that PK
+  # already exists, copy the reified column values onto it and +save!+ that
+  # instead, so reverting is idempotent across repeated delete/undo cycles.
+  def persist_reverted_primary!(object)
+    klass = object.class
+    primary_key = klass.primary_key
+
+    if object.new_record? && object.id.present? && klass.exists?(object.id)
+      existing = klass.find(object.id)
+      existing.assign_attributes(object.attributes.except(primary_key))
+      existing.save!
+      existing
+    else
+      object.save!
+      object
+    end
+  end
+
   # Undoing a parent +destroy+ reifies the Apartment/Photo row only. ActionText
   # bodies live in +action_text_rich_texts+ and get their own PaperTrail
   # +destroy+ versions; those rows are gone after +parent.destroy+, so we also

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "8.1.16"
+  VERSION = "8.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 8.1.16
+  version: 8.1.17
 platform: ruby
 authors:
 - Ace Suares