Skip to content

Update embedded SQLite3 to 3.52.0 #2798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DL6ER merged 1 commit into from
Mar 7, 2026
Merged

Update embedded SQLite3 to 3.52.0 #2798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions patch/sqlite3/0001-print-FTL-version-in-interactive-shell.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ index 6280ebf6..a5e82f70 100644

#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
@@ -32902,7 +32904,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){
#endif

#if SQLITE_SHELL_IS_UTF8
@@ -36236,7 +36236,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){
** fiddle_main In Fiddle
** sqlite3_shell Other projects that use shell.c as a subroutine
*/
-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;
@@ -33656,6 +33658,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
#ifdef SQLITE_DEBUG
sqlite3_int64 mem_main_enter = 0;
#endif
@@ -36882,6 +36882,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
if( stdin_is_interactive ){
char *zHome;
char *zHistory;
+ print_FTL_version();
sqlite3_fprintf(stdout,
cli_printf(stdout,
"SQLite version %s %.19s\n" /*extra-version-info*/
"Enter \".help\" for usage hints.\n",
4 changes: 2 additions & 2 deletions patch/sqlite3/0002-make-sqlite3ErrName-public.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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
@@ -182744,8 +182744,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
@@ -187749,8 +187749,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.
*/
Expand All @@ -12,7 +12,7 @@ index 2763b1b4..55f88efb 100644
const char *zName = 0;
int i, origRc = rc;
for(i=0; i<2 && zName==0; i++, rc &= 0xff){
@@ -182850,7 +182849,6 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
@@ -187856,7 +187856,6 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
}
return zName;
}
Expand Down
2 changes: 1 addition & 1 deletion src/database/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set(sqlite3_sources
add_library(sqlite3 OBJECT ${sqlite3_sources})
# Define the function that will be called to initialize the sqlite3 shell
target_compile_definitions(sqlite3 PRIVATE "-DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_SHELL_INIT_PROC=pihole_sqlite3_initalize")
target_compile_options(sqlite3 PRIVATE -Wno-implicit-fallthrough -Wno-cast-function-type -Wno-sign-compare -Wno-implicit-function-declaration -Wno-int-conversion)
target_compile_options(sqlite3 PRIVATE -Wno-implicit-fallthrough -Wno-cast-function-type -Wno-sign-compare -Wno-implicit-function-declaration -Wno-int-conversion -Wno-unused-function)

if (CMAKE_C_COMPILER_ID STREQUAL "Clang")
target_compile_options(sqlite3 PRIVATE "-Wno-null-pointer-subtraction")
Expand Down
Loading
Loading