# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1776163310 -7200
# Node ID c86377097e825223f2a689e260a3bd0b9138410d
# Parent  412bede39cdbaa509d037adc4869a1c2f0a12f50# Parent  b492e15357375c8603792fa3f1cb15f3f2573b03
merged default -> pg-next-1099

diff -r b492e1535737 -r c86377097e82 PostgreSQL/NEWS
--- a/PostgreSQL/NEWS	Tue Apr 14 12:40:45 2026 +0200
+++ b/PostgreSQL/NEWS	Tue Apr 14 12:41:50 2026 +0200
@@ -1,3 +1,18 @@
+Pending changes in the mainline
+===============================
+
+Changes:
+* Small update of the "DeleteResource" function to avoid a warning when multiple
+  clients are trying to delete the same resource at the same time.
+  TODO: handle migration.
+  Warning:
+  test_concurrent_uploads_same_study (Concurrency.test_concurrency.TestConcurrency.test_concurrent_uploads_same_study) ... 2025-12-05 08:04:24.133 UTC [73] ERROR:  null value in column "resourcetype" of relation "deletedresources" violates not-null constraint
+  2025-12-05 08:04:24.133 UTC [73] DETAIL:  Failing row contains (null, null).
+  2025-12-05 08:04:24.133 UTC [73] CONTEXT:  SQL statement "INSERT INTO DeletedResources VALUES (deleted_resource_row.resourceType, deleted_resource_row.publicId)"
+	PL/pgSQL function deleteresource(bigint) line 85 at SQL statement
+  2025-12-05 08:04:24.133 UTC [73] STATEMENT:  SELECT * FROM DeleteResource($1)
+
+
 Release 10.1 (2026-04-14)
 =========================
 
diff -r b492e1535737 -r c86377097e82 PostgreSQL/Plugins/SQL/PrepareIndex.sql
--- a/PostgreSQL/Plugins/SQL/PrepareIndex.sql	Tue Apr 14 12:40:45 2026 +0200
+++ b/PostgreSQL/Plugins/SQL/PrepareIndex.sql	Tue Apr 14 12:41:50 2026 +0200
@@ -260,9 +260,11 @@
     -- delete the resource itself
     DELETE FROM Resources WHERE internalId=id RETURNING * INTO deleted_resource_row;
 
-    -- keep track of the deleted resources for C++ code
-    INSERT INTO DeletedResources VALUES (deleted_resource_row.resourceType, deleted_resource_row.publicId);
-  
+    IF FOUND THEN
+        -- keep track of the deleted resources for C++ code
+        INSERT INTO DeletedResources VALUES (deleted_resource_row.resourceType, deleted_resource_row.publicId);
+    END IF;
+
     -- If this resource still has siblings, keep track of the remaining parent
     -- (a parent that must not be deleted but whose LastUpdate must be updated)
     SELECT resourceType, publicId INTO remaining_ancestor_resource_type, remaining_anncestor_public_id