From: dan <Dan Kennedy>
Date: Mon, 20 Jul 2026 17:53:36 +0000 (+0000)
Subject: Ensure that a write with REPLACE conflict resolution on an integer primary key column... 
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=cd4b0a19eccb2d4a76e43468757766866fa26776;p=thirdparty%2Fsqlite.git

Ensure that a write with REPLACE conflict resolution on an integer primary key column is handled after any IGNORE or FAIL conflicts, even if there is also an explicit "ON CONFLICT" clause unrelated to the IPK. Forum post [forum:info/2026-07-17T09:30:42Z | 2026-07--17T09:30:42Z]. Also fix a problem whereby a trigger fired by REPLACE conflict resolution might cause a UNIQUE conflict violation to be committed to the database. Forum post [forum:/info/2026-07-18T09:45:24Z | 2026-07-18T09:45:24Z].

FossilOrigin-Name: 8f0ad8f33f5e040eb70b0b77d730c2e785827621bb0ad21afd9ce2efe4dad921
---

cd4b0a19eccb2d4a76e43468757766866fa26776
diff --cc manifest
index 8d2c41e340,5db51d6f8d..6c041784a7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Performance\simprovement\sin\sthe\ssqlite3_initialize()\sinterface.
- D 2026-07-20T11:50:37.472
 -C Additional\stest\scases.
 -D 2026-07-20T16:45:50.238
++C Ensure\sthat\sa\swrite\swith\sREPLACE\sconflict\sresolution\son\san\sinteger\sprimary\skey\scolumn\sis\shandled\safter\sany\sIGNORE\sor\sFAIL\sconflicts,\seven\sif\sthere\sis\salso\san\sexplicit\s"ON\sCONFLICT"\sclause\sunrelated\sto\sthe\sIPK.\sForum\spost\s[forum:info/2026-07-17T09:30:42Z\s|\s2026-07--17T09:30:42Z].\sAlso\sfix\sa\sproblem\swhereby\sa\strigger\sfired\sby\sREPLACE\sconflict\sresolution\smight\scause\sa\sUNIQUE\sconflict\sviolation\sto\sbe\scommitted\sto\sthe\sdatabase.\sForum\spost\s[forum:/info/2026-07-18T09:45:24Z\s|\s2026-07-18T09:45:24Z].
++D 2026-07-20T17:53:36.913
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2215,8 -2216,8 +2216,9 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 987ba5a3dc5f2a2294b77ef3ec1ea06682f0530a7268777c6b64985dd0e90d40
- R 225576c20d8aa54d888d7e314b9b6b32
 -P 7bdce4ec3b9995a13536eaa2e6a5702333e792b35fa58e606b2e4fa38b85f524
 -R fd874cf51ef6f97638af9eb563c42ee4
--U drh
- Z dff319d19633fb41fe302187d5c63413
 -Z 644b4c4329ddc11381dde7b419c5fd9a
++P 4ad701b085ce1b9ada41441f560e55580f0dd33e8145857afce6c665aa974ad0 3ae4f953de5349c7e90ad245a0c21e513d4ef23d636fd786842619aff12c2d27
++R 97577b931e28fb4c4ab0611531033643
++T +closed 3ae4f953de5349c7e90ad245a0c21e513d4ef23d636fd786842619aff12c2d27
++U dan
++Z 60f1f493e6cd861986e8b37e4f51bc19
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c7be5d35b6,469552ca15..a505b938da
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4ad701b085ce1b9ada41441f560e55580f0dd33e8145857afce6c665aa974ad0
 -3ae4f953de5349c7e90ad245a0c21e513d4ef23d636fd786842619aff12c2d27
++8f0ad8f33f5e040eb70b0b77d730c2e785827621bb0ad21afd9ce2efe4dad921