Skip to content

Commit 8690034

Browse files
sjlombardosjlombardo
committed
Snapshot of upstream SQLite 3.41.0
1 parent 93c24ef commit 8690034

File tree

304 files changed

+20803
-25533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+20803
-25533
lines changed

‎Makefile.in‎

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -315,24 +315,6 @@ SRC = \
315315

316316
# Source code for extensions
317317
#
318-
SRC += \
319-
$(TOP)/ext/fts1/fts1.c \
320-
$(TOP)/ext/fts1/fts1.h \
321-
$(TOP)/ext/fts1/fts1_hash.c \
322-
$(TOP)/ext/fts1/fts1_hash.h \
323-
$(TOP)/ext/fts1/fts1_porter.c \
324-
$(TOP)/ext/fts1/fts1_tokenizer.h \
325-
$(TOP)/ext/fts1/fts1_tokenizer1.c
326-
SRC += \
327-
$(TOP)/ext/fts2/fts2.c \
328-
$(TOP)/ext/fts2/fts2.h \
329-
$(TOP)/ext/fts2/fts2_hash.c \
330-
$(TOP)/ext/fts2/fts2_hash.h \
331-
$(TOP)/ext/fts2/fts2_icu.c \
332-
$(TOP)/ext/fts2/fts2_porter.c \
333-
$(TOP)/ext/fts2/fts2_tokenizer.h \
334-
$(TOP)/ext/fts2/fts2_tokenizer.c \
335-
$(TOP)/ext/fts2/fts2_tokenizer1.c
336318
SRC += \
337319
$(TOP)/ext/fts3/fts3.c \
338320
$(TOP)/ext/fts3/fts3.h \
@@ -391,7 +373,6 @@ TESTSRC = \
391373
$(TOP)/src/test4.c \
392374
$(TOP)/src/test5.c \
393375
$(TOP)/src/test6.c \
394-
$(TOP)/src/test7.c \
395376
$(TOP)/src/test8.c \
396377
$(TOP)/src/test9.c \
397378
$(TOP)/src/test_autoext.c \
@@ -420,7 +401,6 @@ TESTSRC = \
420401
$(TOP)/src/test_quota.c \
421402
$(TOP)/src/test_rtree.c \
422403
$(TOP)/src/test_schema.c \
423-
$(TOP)/src/test_server.c \
424404
$(TOP)/src/test_superlock.c \
425405
$(TOP)/src/test_syscall.c \
426406
$(TOP)/src/test_tclsh.c \
@@ -437,7 +417,7 @@ TESTSRC = \
437417
$(TOP)/ext/recover/sqlite3recover.c \
438418
$(TOP)/ext/recover/dbdata.c \
439419
$(TOP)/ext/recover/test_recover.c \
440-
$(TOP)/ext/rbu/test_rbu.c
420+
$(TOP)/ext/rbu/test_rbu.c
441421

442422
# Statically linked extensions
443423
#
@@ -446,6 +426,7 @@ TESTSRC += \
446426
$(TOP)/ext/expert/test_expert.c \
447427
$(TOP)/ext/misc/amatch.c \
448428
$(TOP)/ext/misc/appendvfs.c \
429+
$(TOP)/ext/misc/basexx.c \
449430
$(TOP)/ext/misc/carray.c \
450431
$(TOP)/ext/misc/cksumvfs.c \
451432
$(TOP)/ext/misc/closure.c \
@@ -564,14 +545,6 @@ HDR = \
564545

565546
# Header files used by extensions
566547
#
567-
EXTHDR += \
568-
$(TOP)/ext/fts1/fts1.h \
569-
$(TOP)/ext/fts1/fts1_hash.h \
570-
$(TOP)/ext/fts1/fts1_tokenizer.h
571-
EXTHDR += \
572-
$(TOP)/ext/fts2/fts2.h \
573-
$(TOP)/ext/fts2/fts2_hash.h \
574-
$(TOP)/ext/fts2/fts2_tokenizer.h
575548
EXTHDR += \
576549
$(TOP)/ext/fts3/fts3.h \
577550
$(TOP)/ext/fts3/fts3Int.h \
@@ -615,7 +588,8 @@ TESTOPTS = --verbose=file --output=test-out.txt
615588

616589
# Extra compiler options for various shell tools
617590
#
618-
SHELL_OPT = -DSQLITE_ENABLE_FTS4
591+
SHELL_OPT += -DSQLITE_DQS=0
592+
SHELL_OPT += -DSQLITE_ENABLE_FTS4
619593
#SHELL_OPT += -DSQLITE_ENABLE_FTS5
620594
SHELL_OPT += -DSQLITE_ENABLE_RTREE
621595
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
@@ -648,10 +622,17 @@ FUZZCHECK_SRC += $(TOP)/test/vt02.c
648622
DBFUZZ_OPT =
649623
ST_OPT = -DSQLITE_OS_KV_OPTIONAL
650624

625+
626+
# In wasi-sdk builds, disable the CLI shell build in the "all" target.
627+
SQLITE3_SHELL_TARGET_ = sqlite3$(TEXE)
628+
SQLITE3_SHELL_TARGET_1 =
629+
SQLITE3_SHELL_TARGET = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@)
630+
651631
# This is the default Makefile target. The objects listed here
652632
# are what get build when you type just "make" with no arguments.
653633
#
654-
all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
634+
all: sqlite3.h libsqlite3.la $(SQLITE3_SHELL_TARGET) \
635+
$(HAVE_TCL:1=libtclsqlite3.la)
655636

656637
Makefile: $(TOP)/Makefile.in
657638
./config.status
@@ -778,6 +759,15 @@ sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
778759
cp tsrc/sqlite3ext.h .
779760
cp $(TOP)/ext/session/sqlite3session.h .
780761

762+
sqlite3r.h: sqlite3.h
763+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h
764+
765+
sqlite3r.c: sqlite3.c sqlite3r.h
766+
cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
767+
cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
768+
cp $(TOP)/ext/recover/dbdata.c tsrc/
769+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS)
770+
781771
sqlite3ext.h: .target_source
782772
cp tsrc/sqlite3ext.h .
783773

@@ -1108,6 +1098,9 @@ SHELL_SRC = \
11081098
$(TOP)/ext/misc/appendvfs.c \
11091099
$(TOP)/ext/misc/completion.c \
11101100
$(TOP)/ext/misc/decimal.c \
1101+
$(TOP)/ext/misc/basexx.c \
1102+
$(TOP)/ext/misc/base64.c \
1103+
$(TOP)/ext/misc/base85.c \
11111104
$(TOP)/ext/misc/fileio.c \
11121105
$(TOP)/ext/misc/ieee754.c \
11131106
$(TOP)/ext/misc/regexp.c \
@@ -1135,24 +1128,6 @@ shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
11351128
icu.lo: $(TOP)/ext/icu/icu.c $(HDR) $(EXTHDR)
11361129
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/icu/icu.c
11371130

1138-
fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR) $(EXTHDR)
1139-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2.c
1140-
1141-
fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR) $(EXTHDR)
1142-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_hash.c
1143-
1144-
fts2_icu.lo: $(TOP)/ext/fts2/fts2_icu.c $(HDR) $(EXTHDR)
1145-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_icu.c
1146-
1147-
fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR) $(EXTHDR)
1148-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_porter.c
1149-
1150-
fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR) $(EXTHDR)
1151-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer.c
1152-
1153-
fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
1154-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer1.c
1155-
11561131
fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
11571132
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
11581133

@@ -1307,6 +1282,15 @@ tcltest: ./testfixture$(TEXE)
13071282
testrunner: testfixture$(TEXE)
13081283
./testfixture$(TEXE) $(TOP)/test/testrunner.tcl
13091284

1285+
# Runs both fuzztest and testrunner, consecutively.
1286+
#
1287+
devtest: testfixture$(TEXE) fuzztest testrunner
1288+
1289+
# Testing for a release
1290+
#
1291+
releasetest: testfixture$(TEXE)
1292+
./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release
1293+
13101294
# Minimal testing that runs in less than 3 minutes
13111295
#
13121296
quicktest: ./testfixture$(TEXE)
@@ -1464,9 +1448,6 @@ threadtest: threadtest3$(TEXE)
14641448
threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
14651449
$(LTLINK) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(TLIBS)
14661450

1467-
releasetest:
1468-
$(TCLSH_CMD) $(TOP)/test/releasetest.tcl
1469-
14701451
# Standard install and cleanup targets
14711452
#
14721453
lib_install: libsqlite3.la

‎Makefile.msc‎

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,20 +1412,6 @@ SRC05 = \
14121412
$(TOP)\src\wal.h \
14131413
$(TOP)\src\whereInt.h
14141414

1415-
# Extension source code files, part 1.
1416-
#
1417-
SRC06 = \
1418-
$(TOP)\ext\fts1\fts1.c \
1419-
$(TOP)\ext\fts1\fts1_hash.c \
1420-
$(TOP)\ext\fts1\fts1_porter.c \
1421-
$(TOP)\ext\fts1\fts1_tokenizer1.c \
1422-
$(TOP)\ext\fts2\fts2.c \
1423-
$(TOP)\ext\fts2\fts2_hash.c \
1424-
$(TOP)\ext\fts2\fts2_icu.c \
1425-
$(TOP)\ext\fts2\fts2_porter.c \
1426-
$(TOP)\ext\fts2\fts2_tokenizer.c \
1427-
$(TOP)\ext\fts2\fts2_tokenizer1.c
1428-
14291415
# Extension source code files, part 2.
14301416
#
14311417
SRC07 = \
@@ -1448,16 +1434,6 @@ SRC07 = \
14481434
$(TOP)\ext\rbu\sqlite3rbu.c \
14491435
$(TOP)\ext\misc\stmt.c
14501436

1451-
# Extension header files, part 1.
1452-
#
1453-
SRC08 = \
1454-
$(TOP)\ext\fts1\fts1.h \
1455-
$(TOP)\ext\fts1\fts1_hash.h \
1456-
$(TOP)\ext\fts1\fts1_tokenizer.h \
1457-
$(TOP)\ext\fts2\fts2.h \
1458-
$(TOP)\ext\fts2\fts2_hash.h \
1459-
$(TOP)\ext\fts2\fts2_tokenizer.h
1460-
14611437
# Extension header files, part 2.
14621438
#
14631439
SRC09 = \
@@ -1498,7 +1474,7 @@ SRC12 =
14981474

14991475
# All source code files.
15001476
#
1501-
SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11) $(SRC12)
1477+
SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC07) $(SRC09) $(SRC10) $(SRC11) $(SRC12)
15021478

15031479
# Source code to the test files.
15041480
#
@@ -1509,7 +1485,6 @@ TESTSRC = \
15091485
$(TOP)\src\test4.c \
15101486
$(TOP)\src\test5.c \
15111487
$(TOP)\src\test6.c \
1512-
$(TOP)\src\test7.c \
15131488
$(TOP)\src\test8.c \
15141489
$(TOP)\src\test9.c \
15151490
$(TOP)\src\test_autoext.c \
@@ -1538,7 +1513,6 @@ TESTSRC = \
15381513
$(TOP)\src\test_quota.c \
15391514
$(TOP)\src\test_rtree.c \
15401515
$(TOP)\src\test_schema.c \
1541-
$(TOP)\src\test_server.c \
15421516
$(TOP)\src\test_superlock.c \
15431517
$(TOP)\src\test_syscall.c \
15441518
$(TOP)\src\test_tclsh.c \
@@ -1561,6 +1535,7 @@ TESTEXT = \
15611535
$(TOP)\ext\expert\test_expert.c \
15621536
$(TOP)\ext\misc\amatch.c \
15631537
$(TOP)\ext\misc\appendvfs.c \
1538+
$(TOP)\ext\misc\basexx.c \
15641539
$(TOP)\ext\misc\carray.c \
15651540
$(TOP)\ext\misc\cksumvfs.c \
15661541
$(TOP)\ext\misc\closure.c \
@@ -1605,7 +1580,6 @@ TESTEXT = $(TESTEXT) $(TOP)\ext\misc\zipfile.c
16051580
TESTSRC2 = \
16061581
$(SRC00) \
16071582
$(SRC01) \
1608-
$(SRC06) \
16091583
$(SRC07) \
16101584
$(SRC10) \
16111585
$(TOP)\ext\async\sqlite3async.c
@@ -1640,14 +1614,6 @@ HDR = \
16401614

16411615
# Header files used by extensions
16421616
#
1643-
EXTHDR = $(EXTHDR) \
1644-
$(TOP)\ext\fts1\fts1.h \
1645-
$(TOP)\ext\fts1\fts1_hash.h \
1646-
$(TOP)\ext\fts1\fts1_tokenizer.h
1647-
EXTHDR = $(EXTHDR) \
1648-
$(TOP)\ext\fts2\fts2.h \
1649-
$(TOP)\ext\fts2\fts2_hash.h \
1650-
$(TOP)\ext\fts2\fts2_tokenizer.h
16511617
EXTHDR = $(EXTHDR) \
16521618
$(TOP)\ext\fts3\fts3.h \
16531619
$(TOP)\ext\fts3\fts3Int.h \
@@ -1691,6 +1657,7 @@ FUZZDATA = \
16911657
# when the shell is not being dynamically linked.
16921658
#
16931659
!IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
1660+
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0
16941661
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
16951662
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
16961663
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
@@ -1859,9 +1826,7 @@ mptest: mptester.exe
18591826
for %i in ($(SRC03)) do copy /Y %i tsrc
18601827
for %i in ($(SRC04)) do copy /Y %i tsrc
18611828
for %i in ($(SRC05)) do copy /Y %i tsrc
1862-
for %i in ($(SRC06)) do copy /Y %i tsrc
18631829
for %i in ($(SRC07)) do copy /Y %i tsrc
1864-
for %i in ($(SRC08)) do copy /Y %i tsrc
18651830
for %i in ($(SRC09)) do copy /Y %i tsrc
18661831
for %i in ($(SRC10)) do copy /Y %i tsrc
18671832
for %i in ($(SRC11)) do copy /Y %i tsrc
@@ -2231,6 +2196,8 @@ SHELL_SRC = \
22312196
$(TOP)\src\shell.c.in \
22322197
$(TOP)\ext\misc\appendvfs.c \
22332198
$(TOP)\ext\misc\completion.c \
2199+
$(TOP)\ext\misc\base64.c \
2200+
$(TOP)\ext\misc\base85.c \
22342201
$(TOP)\ext\misc\decimal.c \
22352202
$(TOP)\ext\misc\fileio.c \
22362203
$(TOP)\ext\misc\ieee754.c \
@@ -2264,24 +2231,6 @@ zlib:
22642231
icu.lo: $(TOP)\ext\icu\icu.c $(HDR) $(EXTHDR)
22652232
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\icu\icu.c
22662233

2267-
fts2.lo: $(TOP)\ext\fts2\fts2.c $(HDR) $(EXTHDR)
2268-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2.c
2269-
2270-
fts2_hash.lo: $(TOP)\ext\fts2\fts2_hash.c $(HDR) $(EXTHDR)
2271-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_hash.c
2272-
2273-
fts2_icu.lo: $(TOP)\ext\fts2\fts2_icu.c $(HDR) $(EXTHDR)
2274-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_icu.c
2275-
2276-
fts2_porter.lo: $(TOP)\ext\fts2\fts2_porter.c $(HDR) $(EXTHDR)
2277-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_porter.c
2278-
2279-
fts2_tokenizer.lo: $(TOP)\ext\fts2\fts2_tokenizer.c $(HDR) $(EXTHDR)
2280-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer.c
2281-
2282-
fts2_tokenizer1.lo: $(TOP)\ext\fts2\fts2_tokenizer1.c $(HDR) $(EXTHDR)
2283-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts2\fts2_tokenizer1.c
2284-
22852234
fts3.lo: $(TOP)\ext\fts3\fts3.c $(HDR) $(EXTHDR)
22862235
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3.c
22872236

@@ -2501,6 +2450,16 @@ tcltest: testfixture.exe
25012450
testrunner: testfixture.exe
25022451
.\testfixture.exe $(TOP)\test\testrunner.tcl
25032452

2453+
# Runs both fuzztest and testrunner, consecutively.
2454+
#
2455+
devtest: testfixture.exe fuzztest testrunner
2456+
2457+
# Testing for a release
2458+
#
2459+
releasetest: testfixture.exe fuzztest
2460+
testfixture.exe $(TOP)/test/testrunner.tcl release
2461+
2462+
25042463
smoketest: $(TESTPROGS)
25052464
@set PATH=$(LIBTCLPATH);$(PATH)
25062465
.\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.40.1
1+
3.41.0

‎autoconf/Makefile.msc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ LIBRESOBJS =
955955
# when the shell is not being dynamically linked.
956956
#
957957
!IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
958+
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0
958959
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
959960
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
960961
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1

‎autoconf/tea/configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dnl to configure the system for the local environment.
1919
# so that we create the export library with the dll.
2020
#-----------------------------------------------------------------------
2121

22-
AC_INIT([sqlite],[3.40.0])
22+
AC_INIT([sqlite],[3.41.0])
2323

2424
#--------------------------------------------------------------------
2525
# Call TEA_INIT as the first TEA_ macro to set up initial vars.

0 commit comments

Comments
 (0)