#5407 SQLite updated to 3.51.1 (except for SQLCipher, which is up to 3.50.4).

Author: Paweł Salawa

ChangeLog.md

@@ -1,7 +1,7 @@
 # ChangeLog
 
 ### 3.4.18
-- CHANGE: #5407 SQLite updated to 3.51.1. Updated syntax files, AST and formatter to support syntax updates.
+- CHANGE: #5407 SQLite updated to 3.51.1 (except for SQLCipher, which is up to 3.50.4). Updated syntax files, AST and formatter to support syntax updates.
 - CHANGE: ICU SQLite extension removed from binary packages. Maintaining ICU dependencies in GitHub workflows became an issue, while building SQLiteStudio is primary focus.
 - BUGFIX: #5308 #5358 Fixed handling true/false literals in expressions and on/off/yes/no literals in PRAGMA values.
 - BUGFIX: #5386 Fixed vertical scroll position when refreshing grid data view.

Plugins/DbSqliteCipher/DbSqliteCipher.pro

@@ -22,8 +22,9 @@ SOURCES += dbsqlitecipher.cpp \
 
 HEADERS += dbsqlitecipher.h \
     dbsqlitecipher_global.h \
-    dbsqlitecipherinstance.h
-    sqlcipher.h
+    dbsqlitecipherinstance.h \
+    sqlcipher.h \
+    sqlite_cfg.h
 
 macx: {
     exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
@@ -59,7 +60,8 @@ unix: {
 win32: {
     DEFINES += SQLITE_OS_WIN=1
 }
-DEFINES += SQLITE_HAS_CODEC SQLCIPHER_CRYPTO_OPENSSL BUILD_sqlite NDEBUG SQLITE_ALLOW_XTHREAD_CONNECT=1 SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 \
+DEFINES += SQLITE_HAS_CODEC BUILD_sqlite NDEBUG SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 \
+    SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown _HAVE_SQLITE_CONFIG_H \
     SQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
     SQLITE_ENABLE_DBSTAT_VTAB=1 \
     SQLITE_ENABLE_BYTECODE_VTAB=1 \
@@ -74,7 +76,6 @@ DEFINES += SQLITE_HAS_CODEC SQLCIPHER_CRYPTO_OPENSSL BUILD_sqlite NDEBUG SQLITE_
     SQLITE_ENABLE_RTREE=1 \
     SQLITE_ENABLE_MATH_FUNCTIONS=1
 
-
 OTHER_FILES += \
     dbsqlitecipher.json \
     sqlcipher.txt \

Plugins/DbSqliteCipher/sqlcipher.c

@@ -0,0 +1,61 @@
+#ifndef _SQLITE_CFG_H
+#define _SQLITE_CFG_H
+#define HAVE_CEIL 1
+#define HAVE_DEFLATE 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DLFCN_H 1
+#define HAVE_DLOPEN 1
+/* #undef HAVE_EDITLINE */
+/* #undef HAVE_EMSDK */
+#define HAVE_FDATASYNC 1
+#define HAVE_GMTIME_R 1
+#define HAVE_INT16_T 1
+#define HAVE_INT32_T 1
+#define HAVE_INT64_T 1
+#define HAVE_INT8_T 1
+#define HAVE_INTPTR_T 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_ISNAN 1
+#define HAVE_LFS 1
+/* #undef HAVE_LINENOISE */
+#define HAVE_LOCALTIME_R 1
+/* #undef HAVE_LOCALTIME_S */
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_PREAD 1
+#define HAVE_PREAD64 1
+#define HAVE_PTHREAD_CREATE 1
+#define HAVE_PTHREAD_MUTEXATTR_INIT 1
+#define HAVE_PWRITE 1
+#define HAVE_PWRITE64 1
+#define HAVE_READLINE 1
+#define HAVE_REALPATH 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRCHRNUL 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_TCL 1
+#define HAVE_TGETENT 1
+#define HAVE_UINT16_T 1
+#define HAVE_UINT32_T 1
+#define HAVE_UINT64_T 1
+#define HAVE_UINT8_T 1
+#define HAVE_UINTPTR_T 1
+#define HAVE_UNISTD_H 1
+#define HAVE_USLEEP 1
+#define HAVE_UTIME 1
+/* #undef HAVE_WASI_SDK */
+#define HAVE_ZLIB 1
+#define HAVE_ZLIB_H 1
+#define PACKAGE_BUGREPORT "https://sqlite.org/forum"
+#define PACKAGE_NAME "sqlite"
+#define PACKAGE_STRING "sqlite 3.50.4"
+#define PACKAGE_URL "https://sqlite.org"
+#define PACKAGE_VERSION "3.50.4"
+#define SIZEOF_OFF_T 8
+#endif

Plugins/DbSqliteCipher/sqlcipher.h

@@ -5,20 +5,23 @@
 # Download page:
 # https://github.com/sqlcipher/sqlcipher/releases
 
-set THE_URL "https://codeload.github.com/sqlcipher/sqlcipher/zip/v4.6.1"
+set CIPHER_VER 4.11.0
+set THE_URL "https://codeload.github.com/sqlcipher/sqlcipher/zip/refs/tags/v${CIPHER_VER}"
+#set THE_URL "https://codeload.github.com/sqlcipher/sqlcipher/zip/v${CIPHER_VER}"
 
 proc process {} {
 	if {[catch {
-		wget $::THE_URL sqlite.zip
+		#wget $::THE_URL sqlite.zip
 		puts "Decompressing to 'sqlite' directory."
 		exec 7z x -osqlite sqlite.zip
 
 		set dir [lindex [glob -directory sqlite sqlcipher-*] 0]
 
 		puts "Running ./configure and make to generate sqlite3.c"
 		cd $dir
-		catch {exec ./configure --enable-fts5 --enable-json1 --enable-update-limit --enable-geopoly --enable-rtree --enable-session --enable-gcov --disable-tcl}
-		catch {exec make}
+		catch {exec ./configure --all --with-tempstore=yes --disable-tcl}
+		catch {exec make sqlite3.h}
+		catch {exec make sqlite3.c}
 		cd ../..
 
 		copy $dir/sqlite3.c

Plugins/DbSqliteCipher/sqlite_cfg.h

@@ -4,7 +4,9 @@
 # https://github.com/utelle/wxsqlite3/releases
 # Link from download page will redicrect to the codeload.....
 
-set THE_URL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v2.0.3/sqlite3mc-2.0.3-sqlite-3.49.0-amalgamation.zip"
+set MC_VER 2.2.6
+set SQLITE_VER 3.51.1
+set THE_URL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v${MC_VER}/sqlite3mc-${MC_VER}-sqlite-${SQLITE_VER}-amalgamation.zip"
 
 set SRC_DIR "src"
 set FILES [list \