From: drh <>
Date: Fri, 12 Sep 2025 15:20:39 +0000 (+0000)
Subject: Add more details to comments in the previous check-in.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28a7f01f90046f5cf7a1b590a8e34a8668a1d69b;p=thirdparty%2Fsqlite.git

Add more details to comments in the previous check-in.

FossilOrigin-Name: ed36b3aa4b68c6bb347b6851ea61bcad9712c4a9ed39e3fb4f84cb9b9ee48dc2
---

diff --git a/manifest b/manifest
index e8baa6e416..96bab37322 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sexperimental\sAPI\ssqlite3_set_errmsg().\sUse\sthis\sin\ssqlite3changeset_apply()\sto\sreturn\sany\serror\scode\sand\serror\smessage\svia\sthe\sSQLite\shandle.
-D 2025-09-12T15:02:47.133
+C Add\smore\sdetails\sto\scomments\sin\sthe\sprevious\scheck-in.
+D 2025-09-12T15:20:39.414
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -705,7 +705,7 @@ F src/insert.c dfd311b0ac2d4f6359e62013db67799757f4d2cc56cca5c10f4888acfbbfa3fd
 F src/json.c cb87977b1ee25ee7d27505d65a9261b687395bf895342c8ba566b7c01aee2047
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c d7edd8e671237539d795d30daaf888908a2c82e99bade4c78f3be021e8b7d655
-F src/main.c a826d261631d1510184476fe4784f6f4ab64a5ac1b38bbc68c60148acd63feeb
+F src/main.c 8faccfa7dc8a470ac57f060948ff703da1f2dbedcd4cebc0a21caeb7facf7eef
 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -743,7 +743,7 @@ F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
 F src/shell.c.in c309e6e95b4de2be9dd0fbe4d40f729199a85bcc54d66759a0aef3b3e6504b22
-F src/sqlite.h.in 527d13b8cf5ed097cea7f806565eab5b6c783799da89a21223b422308b3b4479
+F src/sqlite.h.in 3c31d242bbdeb1136c843d5ecf1daa70c7ae0e2cdfa319f90df0124bc8ce6069
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
 F src/sqliteInt.h 27c73e48878d31ef230ba867d1f8c3af6aed357fd93ccc605d3f1aae007ea62b
@@ -2174,11 +2174,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ef3b7be6f2037871f6f1b1944fed3dda28216e7f179080d3be2e2620c031f48c
-R 262c29c5815b20dcd06e87f8949e0e9a
-T *branch * sqlite3-set-errmsg
-T *sym-sqlite3-set-errmsg *
-T -sym-trunk *
-U dan
-Z ca78b995013b1b3c1c01f7a5a981e1b3
+P 4d5b60a1e57448f03af2a657fe7cdabb04ebaf9688d5cc700dd8f9892a5cba15
+R 356e71ef313aad272ec815f6a6a0aa79
+U drh
+Z 883b1b64c308b9c3d75c702851f1b360
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 29425ccd3f..fc6a205474 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d5b60a1e57448f03af2a657fe7cdabb04ebaf9688d5cc700dd8f9892a5cba15
+ed36b3aa4b68c6bb347b6851ea61bcad9712c4a9ed39e3fb4f84cb9b9ee48dc2
diff --git a/src/main.c b/src/main.c
index e079cbed3f..4cd37e23e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2718,6 +2718,10 @@ const char *sqlite3_errmsg(sqlite3 *db){
 
 /*
 ** Set the error code and error message associated with the database handle.
+**
+** This routine is intended to be called by outside extensions (ex: the
+** Session extension). Internal logic should invoke sqlite3Error() or
+** sqlite3ErrorWithMsg() directly.
 */
 int sqlite3_set_errmsg(sqlite3 *db, int errcode, const char *zMsg){
   int rc = SQLITE_OK;
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 05c14f5fd2..441584b2f4 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4213,11 +4213,24 @@ int sqlite3_error_offset(sqlite3 *db);
 ** Set the error code of the database handle passed as the first argument
 ** to errcode, and the error message to a copy of nul-terminated string
 ** zErrMsg. If zErrMsg is passed NULL, then the error message is set to
-** the default message associated with the supplied error code.
+** the default message associated with the supplied error code.  Subsequent
+** calls to [sqlite3_errcode()] and [sqlite3_errmsg()] and similar will
+** return the values set by this routine in place of what was previously
+** set by SQLite itself.
 **
 ** This function returns SQLITE_OK if the error code and error message are
 ** successfully set, SQLITE_NOMEM if an OOM occurs, and SQLITE_MISUSE if
 ** the database handle is NULL or invalid.
+**
+** The error code and message set by this routine remains in affect until
+** they are changed, either by another call to this routine or until they are
+** changed to by SQLite itself to reflect the result of some subsquent
+** API call.
+**
+** This function is intended for use by SQLite extensions or wrappers.  The
+** idea is that an extension or wrapper can use this routine to set error
+** messages and error codes and thus behave more like a core core SQLite
+** feature from the point of view of an application.
 */
 int sqlite3_set_errmsg(sqlite3 *db, int errcode, const char *zErrMsg);