Skip to content

Commit 4745d8a

Browse files
sjlombardosjlombardo
committed
Snapshot of upstream SQLite 3.27.1
1 parent 4d9565b commit 4745d8a

File tree

220 files changed

+21131
-2752
lines changed

Some content is hidden

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

220 files changed

+21131
-2752
lines changed

‎Makefile.in‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ TESTSRC += \
452452
$(TOP)/ext/misc/nextchar.c \
453453
$(TOP)/ext/misc/normalize.c \
454454
$(TOP)/ext/misc/percentile.c \
455+
$(TOP)/ext/misc/prefixes.c \
455456
$(TOP)/ext/misc/regexp.c \
456457
$(TOP)/ext/misc/remember.c \
457458
$(TOP)/ext/misc/series.c \
@@ -588,7 +589,8 @@ FUZZDATA = \
588589
$(TOP)/test/fuzzdata4.db \
589590
$(TOP)/test/fuzzdata5.db \
590591
$(TOP)/test/fuzzdata6.db \
591-
$(TOP)/test/fuzzdata7.db
592+
$(TOP)/test/fuzzdata7.db \
593+
$(TOP)/test/fuzzdata8.db
592594

593595
# Standard options to testfixture
594596
#
@@ -611,6 +613,12 @@ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
611613
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
612614
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
613615
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
616+
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
617+
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
618+
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
619+
FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
620+
FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
621+
FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
614622
FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
615623
DBFUZZ_OPT =
616624

@@ -669,7 +677,7 @@ ossshell$(TEXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.
669677
$(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS)
670678

671679
sessionfuzz$(TEXE): $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h
672-
$(CC) $(CFLAGS) -I. -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS)
680+
$(LTLINK) -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS)
673681

674682
dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
675683
$(LTLINK) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(TLIBS)
@@ -682,11 +690,26 @@ DBFUZZ2_OPTS = \
682690
-DSQLITE_ENABLE_DBSTAT_VTAB \
683691
-DSQLITE_ENABLE_RTREE \
684692
-DSQLITE_ENABLE_FTS4 \
685-
-DSQLITE_EANBLE_FTS5
693+
-DSQLITE_ENABLE_FTS5
686694

687-
dbfuzz2: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
688-
clang-6.0 -I. -g -O0 -fsanitize=fuzzer,undefined,address -o dbfuzz2 \
689-
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c
695+
dbfuzz2$(TEXE): $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
696+
$(CC) $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
697+
-DSTANDALONE -o dbfuzz2 \
698+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
699+
mkdir -p dbfuzz2-dir
700+
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
701+
702+
dbfuzz2-asan: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
703+
clang-6.0 $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
704+
-fsanitize=fuzzer,undefined,address -o dbfuzz2-asan \
705+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
706+
mkdir -p dbfuzz2-dir
707+
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
708+
709+
dbfuzz2-msan: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
710+
clang-6.0 $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
711+
-fsanitize=fuzzer,undefined,memory -o dbfuzz2-msan \
712+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
690713
mkdir -p dbfuzz2-dir
691714
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
692715

@@ -1052,6 +1075,7 @@ SHELL_SRC = \
10521075
$(TOP)/ext/expert/sqlite3expert.c \
10531076
$(TOP)/ext/expert/sqlite3expert.h \
10541077
$(TOP)/ext/misc/zipfile.c \
1078+
$(TOP)/ext/misc/memtrace.c \
10551079
$(TOP)/src/test_windirent.c
10561080

10571081
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
@@ -1189,6 +1213,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
11891213
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
11901214
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
11911215
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
1216+
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
11921217

11931218
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
11941219
TESTFIXTURE_SRC1 = sqlite3.c
@@ -1291,6 +1316,9 @@ dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
12911316
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
12921317
$(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
12931318

1319+
dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
1320+
$(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
1321+
12941322
showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
12951323
$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
12961324

@@ -1306,6 +1334,9 @@ showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
13061334
showshm$(TEXE): $(TOP)/tool/showshm.c
13071335
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
13081336

1337+
index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
1338+
$(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
1339+
13091340
changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
13101341
$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
13111342

‎Makefile.msc‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,7 @@ TESTEXT = \
15271527
$(TOP)\ext\misc\nextchar.c \
15281528
$(TOP)\ext\misc\normalize.c \
15291529
$(TOP)\ext\misc\percentile.c \
1530+
$(TOP)\ext\misc\prefixes.c \
15301531
$(TOP)\ext\misc\regexp.c \
15311532
$(TOP)\ext\misc\remember.c \
15321533
$(TOP)\ext\misc\series.c \
@@ -1625,7 +1626,8 @@ FUZZDATA = \
16251626
$(TOP)\test\fuzzdata4.db \
16261627
$(TOP)\test\fuzzdata5.db \
16271628
$(TOP)\test\fuzzdata6.db \
1628-
$(TOP)\test\fuzzdata7.db
1629+
$(TOP)\test\fuzzdata7.db \
1630+
$(TOP)\test\fuzzdata8.db
16291631
# <</mark>>
16301632

16311633
# Additional compiler options for the shell. These are only effective
@@ -1643,7 +1645,13 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
16431645
#
16441646
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
16451647
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
1646-
FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1648+
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1649+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DESERIALIZE
1650+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
1651+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
1652+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
1653+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
1654+
16471655
FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
16481656
OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
16491657
DBFUZZ_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
@@ -1730,10 +1738,10 @@ dbfuzz.exe: $(TOP)\test\dbfuzz.c $(SQLITE3C) $(SQLITE3H)
17301738
$(LTLINK) $(NO_WARN) $(DBFUZZ_COMPILE_OPTS) $(TOP)\test\dbfuzz.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17311739

17321740
fuzzcheck.exe: $(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
1733-
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1741+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17341742

17351743
ossshell.exe: $(OSSSHELL_SRC) $(SQLITE3C) $(SQLITE3H)
1736-
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1744+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17371745

17381746
sessionfuzz.exe: zlib $(TOP)\test\sessionfuzz.c $(SQLITE3C) $(SQLITE3H)
17391747
$(LTLINK) $(NO_WARN) -I$(ZLIBINCDIR) $(TOP)\test\sessionfuzz.c /link $(LDFLAGS) $(LTLINKOPTS) /LIBPATH:$(ZLIBLIBDIR) $(ZLIBLIB)
@@ -2130,6 +2138,7 @@ SHELL_SRC = \
21302138
$(TOP)\ext\misc\completion.c \
21312139
$(TOP)\ext\expert\sqlite3expert.c \
21322140
$(TOP)\ext\expert\sqlite3expert.h \
2141+
$(TOP)\ext\misc\memtrace.c \
21332142
$(TOP)\src\test_windirent.c
21342143

21352144
# If use of zlib is enabled, add the "zipfile.c" source file.
@@ -2298,6 +2307,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
22982307
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
22992308
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23002309
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
2310+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23012311
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
23022312

23032313
TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -2425,6 +2435,9 @@ testloadext.lo: $(TOP)\src\test_loadext.c $(SQLITE3H)
24252435
testloadext.dll: testloadext.lo
24262436
$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ testloadext.lo
24272437

2438+
dbtotxt.exe: $(TOP)\tool\dbtotxt.c
2439+
$(LTLINK) $(NO_WARN) $(TOP)\tool\dbtotxt.c /link $(LDFLAGS) $(LTLINKOPTS)
2440+
24282441
showdb.exe: $(TOP)\tool\showdb.c $(SQLITE3C) $(SQLITE3H)
24292442
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
24302443
$(TOP)\tool\showdb.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@@ -2444,6 +2457,10 @@ showwal.exe: $(TOP)\tool\showwal.c $(SQLITE3C) $(SQLITE3H)
24442457
showshm.exe: $(TOP)\tool\showshm.c
24452458
$(LTLINK) $(NO_WARN) $(TOP)\tool\showshm.c /link $(LDFLAGS) $(LTLINKOPTS)
24462459

2460+
index_usage.exe: $(TOP)\tool\index_usage.c $(SQLITE3C) $(SQLITE3H)
2461+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
2462+
$(TOP)\tool\index_usage.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
2463+
24472464
changeset.exe: $(TOP)\ext\session\changeset.c $(SQLITE3C) $(SQLITE3H)
24482465
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
24492466
-DSQLITE_ENABLE_SESSION=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 \

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.26.0
1+
3.27.1

‎autoconf/Makefile.msc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
283283
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
284284
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
285285
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
286+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
286287
!ENDIF
287288
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
288289
!ENDIF
@@ -937,6 +938,7 @@ LIBRESOBJS =
937938
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
938939
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
939940
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
941+
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
940942
!ENDIF
941943

942944

‎configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for sqlite 3.26.0.
3+
# Generated by GNU Autoconf 2.69 for sqlite 3.27.1.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ MAKEFLAGS=
726726
# Identity of this package.
727727
PACKAGE_NAME='sqlite'
728728
PACKAGE_TARNAME='sqlite'
729-
PACKAGE_VERSION='3.26.0'
730-
PACKAGE_STRING='sqlite 3.26.0'
729+
PACKAGE_VERSION='3.27.1'
730+
PACKAGE_STRING='sqlite 3.27.1'
731731
PACKAGE_BUGREPORT=''
732732
PACKAGE_URL=''
733733

@@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
14661466
# Omit some internal or obsolete options to make the list less imposing.
14671467
# This message is too long to be a string in the A/UX 3.1 sh.
14681468
cat <<_ACEOF
1469-
\`configure' configures sqlite 3.26.0 to adapt to many kinds of systems.
1469+
\`configure' configures sqlite 3.27.1 to adapt to many kinds of systems.
14701470
14711471
Usage: $0 [OPTION]... [VAR=VALUE]...
14721472
@@ -1531,7 +1531,7 @@ fi
15311531

15321532
if test -n "$ac_init_help"; then
15331533
case $ac_init_help in
1534-
short | recursive ) echo "Configuration of sqlite 3.26.0:";;
1534+
short | recursive ) echo "Configuration of sqlite 3.27.1:";;
15351535
esac
15361536
cat <<\_ACEOF
15371537
@@ -1657,7 +1657,7 @@ fi
16571657
test -n "$ac_init_help" && exit $ac_status
16581658
if $ac_init_version; then
16591659
cat <<\_ACEOF
1660-
sqlite configure 3.26.0
1660+
sqlite configure 3.27.1
16611661
generated by GNU Autoconf 2.69
16621662
16631663
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,7 @@ cat >config.log <<_ACEOF
20762076
This file contains any messages produced by compilers while
20772077
running configure, to aid debugging if configure makes a mistake.
20782078
2079-
It was created by sqlite $as_me 3.26.0, which was
2079+
It was created by sqlite $as_me 3.27.1, which was
20802080
generated by GNU Autoconf 2.69. Invocation command line was
20812081
20822082
$ $0 $@
@@ -12232,7 +12232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1223212232
# report actual input values of CONFIG_FILES etc. instead of their
1223312233
# values after options handling.
1223412234
ac_log="
12235-
This file was extended by sqlite $as_me 3.26.0, which was
12235+
This file was extended by sqlite $as_me 3.27.1, which was
1223612236
generated by GNU Autoconf 2.69. Invocation command line was
1223712237
1223812238
CONFIG_FILES = $CONFIG_FILES
@@ -12298,7 +12298,7 @@ _ACEOF
1229812298
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1229912299
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1230012300
ac_cs_version="\\
12301-
sqlite config.status 3.26.0
12301+
sqlite config.status 3.27.1
1230212302
configured by $0, generated by GNU Autoconf 2.69,
1230312303
with options \\"\$ac_cs_config\\"
1230412304

‎ext/expert/expert1.test‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,10 @@ do_setup_rec_test $tn.12.1 {
243243
CREATE INDEX t7_idx_00000062 ON t7(b);
244244
CREATE INDEX t7_idx_00000061 ON t7(a);
245245
MULTI-INDEX OR
246-
SEARCH TABLE t7 USING INDEX t7_idx_00000061 (a=?)
247-
SEARCH TABLE t7 USING INDEX t7_idx_00000062 (b=?)
246+
INDEX 1
247+
SEARCH TABLE t7 USING INDEX t7_idx_00000061 (a=?)
248+
INDEX 2
249+
SEARCH TABLE t7 USING INDEX t7_idx_00000062 (b=?)
248250
}
249251

250252
# rowid terms.

0 commit comments

Comments
 (0)