Print more detailed ("extended") error code in SQLite3 code

patch/sqlite3.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+patch src/database/shell.c patches/sqlite3/0001-print-FTL-version-in-interactive-shell.patch
+patch src/database/sqlite3.c patches/sqlite3/0002-make-sqlite3ErrName-public.patch

patch/sqlite3/0001-print-FTL-version-in-interactive-shell.patch

@@ -0,0 +1,30 @@
+diff --git a/src/database/shell.c b/src/database/shell.c
+index 6280ebf6..a5e82f70 100644
+--- a/src/database/shell.c
++++ b/src/database/shell.c
+@@ -126,6 +126,8 @@ typedef unsigned char u8;
+ #endif
+ #include <ctype.h>
+ #include <stdarg.h>
++// print_FTL_version()
++#include "../log.h"
+
+ #if !defined(_WIN32) && !defined(WIN32)
+ # include <signal.h>
+@@ -25855,7 +25857,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){
+ #endif
+
+ #if SQLITE_SHELL_IS_UTF8
+-int SQLITE_CDECL main(int argc, char **argv){
++int SQLITE_CDECL sqlite3_shell_main(int argc, char **argv){
+ #else
+ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
+   char **argv;
+@@ -26377,6 +26379,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
+       char *zHome;
+       char *zHistory;
+       int nHistory;
++      print_FTL_version();
+       printf(
+         "SQLite version %s %.19s\n" /*extra-version-info*/
+         "Enter \".help\" for usage hints.\n",

patch/sqlite3/0002-make-sqlite3ErrName-public.patch

@@ -0,0 +1,22 @@
+diff --git a/src/database/sqlite3.c b/src/database/sqlite3.c
+index 2763b1b4..55f88efb 100644
+--- a/src/database/sqlite3.c
++++ b/src/database/sqlite3.c
+@@ -173885,8 +173885,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
+ ** Return a static string containing the name corresponding to the error code
+ ** specified in the argument.
+ */
+-#if defined(SQLITE_NEED_ERR_NAME)
+-SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
++SQLITE_API const char *sqlite3ErrName(int rc){
+   const char *zName = 0;
+   int i, origRc = rc;
+   for(i=0; i<2 && zName==0; i++, rc &= 0xff){
+@@ -173991,7 +173990,6 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
+   }
+   return zName;
+ }
+-#endif
+
+ /*
+ ** Return a static string that describes the kind of error specified in the

src/database/common.c

@@ -146,8 +146,8 @@ int dbquery(sqlite3* db, const char *format, ...)
 
 	int rc = sqlite3_exec(db, query, NULL, NULL, NULL);
 	if( rc != SQLITE_OK ){
-		logg("ERROR: SQL query \"%s\" failed: %s",
-		     query, sqlite3_errstr(rc));
+		logg("ERROR: SQL query \"%s\" failed: %s (%s)",
+		     query, sqlite3_errstr(rc), sqlite3ErrName(sqlite3_extended_errcode(db)));
 		sqlite3_free(query);
 		checkFTLDBrc(rc);
 		return rc;

src/database/common.h

@@ -54,6 +54,9 @@ bool FTLDBerror(void) __attribute__ ((pure));
 // Check SQLite3 non-success return codes for possible database corruption
 bool checkFTLDBrc(const int rc);
 
+// Get human-readable *extended* error codes (defined in sqlite3.c)
+extern const char *sqlite3ErrName(int rc);
+
 // Database macros
 #define SQL_bool(db, ...) {\
 	int ret;\

src/database/shell.c

@@ -26580,4 +26580,4 @@ void fiddle_exec(const char * zSql){
     shellState.wasm.zInput = shellState.wasm.zPos = 0;
   }
 }
-#endif /* SQLITE_SHELL_FIDDLE */
+#endif /* SQLITE_SHELL_FIDDLE */

src/database/sqlite3.c

@@ -173885,8 +173885,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
 ** Return a static string containing the name corresponding to the error code
 ** specified in the argument.
 */
-#if defined(SQLITE_NEED_ERR_NAME)
-SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
+SQLITE_API const char *sqlite3ErrName(int rc){
   const char *zName = 0;
   int i, origRc = rc;
   for(i=0; i<2 && zName==0; i++, rc &= 0xff){
@@ -173991,7 +173990,6 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
   }
   return zName;
 }
-#endif
 
 /*
 ** Return a static string that describes the kind of error specified in the
@@ -243517,4 +243515,4 @@ SQLITE_API int sqlite3_stmt_init(
 /************** End of stmt.c ************************************************/
 /* Return the source-id for this library */
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-/************************** End of sqlite3.c ******************************/
+/************************** End of sqlite3.c ******************************/

src/database/sqlite3.h

@@ -12884,4 +12884,4 @@ struct fts5_api {
 
 #endif /* _FTS5_H */
 
-/******** End of fts5.h *********/
+/******** End of fts5.h *********/