From: dan <Dan Kennedy>
Date: Fri, 12 Sep 2025 17:13:59 +0000 (+0000)
Subject: Add sqlite3_set_errmsg(). Use this in sqlite3changeset_apply() to return any error... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c4008fe263e514d66e4c2e26b90a6de23b7642e;p=thirdparty%2Fsqlite.git

Add sqlite3_set_errmsg(). Use this in sqlite3changeset_apply() to return any error code and error message via the SQLite handle.

FossilOrigin-Name: e34eda113c8819df46c139ccf749b686c8bfdd399f59345c6d6be3736bdf97cb
---

2c4008fe263e514d66e4c2e26b90a6de23b7642e
diff --cc ext/session/sqlite3session.h
index 15361acc2d,15361acc2d..28b90eb6b5
--- a/ext/session/sqlite3session.h
+++ b/ext/session/sqlite3session.h
@@@ -1118,7 -1118,7 +1118,10 @@@ void sqlite3changegroup_delete(sqlite3_
  ** If any other error (aside from a constraint failure when attempting to
  ** write to the target database) occurs, then the savepoint transaction is
  ** rolled back, restoring the target database to its original state, and an 
--** SQLite error code returned.
++** SQLite error code returned. Additionally, starting with version 3.51.0,
++** an error code and error message that may be accessed using the
++** [sqlite3_errcode()] and [sqlite3_errmsg()] APIs are left in the database
++** handle.
  **
  ** The fourth argument (xFilter) passed to these functions is the "filter
  ** callback". This may be passed NULL, in which case all changes in the
diff --cc manifest
index 2b7a3014da,3a5cb7fbdd..e9a9462e28
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\soff-by-one\serror\sin\ssqlite3_rsync.\n[forum:/info/46753431d4|Forum\spost\s46753431d4].
- D 2025-09-11T10:58:49.199
 -C Typo\sfixes.\s\sMake\ssqlite3_set_errmsg()\saccessible\sto\srun-time\sloadable\nextensions.
 -D 2025-09-12T15:31:33.770
++C Add\ssqlite3_set_errmsg().\sUse\sthis\sin\ssqlite3changeset_apply()\sto\sreturn\sany\serror\scode\sand\serror\smessage\svia\sthe\sSQLite\shandle.
++D 2025-09-12T17:13:59.656
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -573,8 -573,8 +573,8 @@@ F ext/session/sessionrowid.test 85187c2
  F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
  F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
- F ext/session/sqlite3session.c 9205e6e8f389ea44a8118082ce3832374da92284a60e4fb3ea6b1b421f0dbc54
- F ext/session/sqlite3session.h 6641184274b1d46594e450793d39aa96053916043234fb9e653c661160a166a7
+ F ext/session/sqlite3session.c 9cd47bfefb23c114b7a5d9ee5822d941398902f30516bf0ddfb131d94f8bb840
 -F ext/session/sqlite3session.h 6641184274b1d46594e450793d39aa96053916043234fb9e653c661160a166a7
++F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
  F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
  F ext/wasm/GNUmakefile 89e18d6e4783841a5236930b988df27e02317b3ac440a1a5571de4a79df3c8e7
@@@ -2174,8 -2174,8 +2174,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5bc6b9352236df3091ee69b947d0c397264156539d13e5968ec3b9a6e55dc800
- R a5539b6621653da7959fb888474ce821
 -P ed36b3aa4b68c6bb347b6851ea61bcad9712c4a9ed39e3fb4f84cb9b9ee48dc2
 -R e746890c0ffada398be86dcbb8bb6216
--U drh
- Z 3cde64f623da7bc733a5eed51b57ab95
 -Z 649b29c859d66a30049be3851479ddc7
++P ef3b7be6f2037871f6f1b1944fed3dda28216e7f179080d3be2e2620c031f48c 93a41e31322eec70476f7d81f4af7fb8476cad21a56d6b1048a9e0c0c440bf72
++R a207fc3414bd2a46c8354c4b54e3f840
++U dan
++Z bde2cf4e38c3019e148d1a796df5aabf
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ea679c53ec,1b57f01a53..db6c6c77bb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ef3b7be6f2037871f6f1b1944fed3dda28216e7f179080d3be2e2620c031f48c
 -93a41e31322eec70476f7d81f4af7fb8476cad21a56d6b1048a9e0c0c440bf72
++e34eda113c8819df46c139ccf749b686c8bfdd399f59345c6d6be3736bdf97cb