From: drh <>
Date: Thu, 17 Nov 2022 01:24:06 +0000 (+0000)
Subject: Raise an error if an attempt is made to compile the CLI with the
X-Git-Tag: version-3.41.0~421
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=841c98e14ca76ed96661583c4739629f0b2e876b;p=thirdparty%2Fsqlite.git

Raise an error if an attempt is made to compile the CLI with the
SQLITE_OMIT_COMPLETE option, since sqlite3_complete() really is necessary
for the CLI to operate sanely.

FossilOrigin-Name: a119a9e2ade4eac5feb1aa885c15b83e725f87386351de99d3abb49656219d50
---

diff --git a/manifest b/manifest
index 987375b147..22f3b0c245 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sa\sself.X\sJS\sreference\sto\sX\sto\saccount\sfor\sa\ssymbol\sresolution\sdiscrepancy\sbetween\svanilla\sJS\sand\sES6\smodules,\sas\sexplained\sin\s[forum:801d8f77e5115141|forum\spost\s801d8f77e5115141].
-D 2022-11-16T21:52:29.439
+C Raise\san\serror\sif\san\sattempt\sis\smade\sto\scompile\sthe\sCLI\swith\sthe\nSQLITE_OMIT_COMPLETE\soption,\ssince\ssqlite3_complete()\sreally\sis\snecessary\nfor\sthe\sCLI\sto\soperate\ssanely.
+D 2022-11-17T01:24:06.314
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
-F src/shell.c.in 458cb3de9d548342fc645b699620b1af3de770d2ceec09ac71f86c19bd244064
+F src/shell.c.in a0ba4a297f8134fef1a6b618ac57604a6c4f1eadeab4f6950b99a8bc151f3c1f
 F src/sqlite.h.in bdb10b78166f5b735318667eb16c84ac90d9e0de88cc25c193eeb4379a126945
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -2055,8 +2055,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 85c3f2ac5a887ba809f236c8c9d3837b2fdb578d4beae61bc78ada7ce03b58e2
-R 7b8987d4eb67ce150345834e9ef9546a
-U stephan
-Z 50adbd5c6dbf458e11e189272fde1820
+P 0590de4da1103d842b9f9f25bcd2e69223b2ea067ae2f320f58dd3763218b39d
+R 9a1abb4a6d0ca4f10b6b70f7ecc4eaec
+U drh
+Z 23b35cc422152da909abe420b023163d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f20330e90..ab03b00c16 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0590de4da1103d842b9f9f25bcd2e69223b2ea067ae2f320f58dd3763218b39d
\ No newline at end of file
+a119a9e2ade4eac5feb1aa885c15b83e725f87386351de99d3abb49656219d50
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index f164789776..6b038495f5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10959,13 +10959,11 @@ static int line_is_command_terminator(char *zLine){
 }
 
 /*
-** We need a default sqlite3_complete() implementation to use in case
-** the shell is compiled with SQLITE_OMIT_COMPLETE.  The default assumes
-** any arbitrary text is a complete SQL statement.  This is not very
-** user-friendly, but it does seem to work.
+** The CLI needs a working sqlite3_complete() to work properly.  So error
+** out of the build if compiling with SQLITE_OMIT_COMPLETE.
 */
 #ifdef SQLITE_OMIT_COMPLETE
-#define sqlite3_complete(x) 1
+# error the CLI application is imcompatable with SQLITE_OMIT_COMPLETE.
 #endif
 
 /*