8000 Snapshot of upstream SQLite 3.38.2 · sqlcipher/sqlcipher@5ddd6e7 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 5ddd6e7

Browse files
sjlombardosjlombardo
committed
Snapshot of upstream SQLite 3.38.2
1 parent 90401f0 commit 5ddd6e7

File tree

194 files changed

+7996
-2743
lines changed

Some content is hidden

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

194 files changed

+7996
-2743
lines changed

‎Makefile.in

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
180180
fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
181181
fts5.lo \
182182
func.lo global.lo hash.lo \
183-
icu.lo insert.lo json1.lo legacy.lo loadext.lo \
183+
icu.lo insert.lo json.lo legacy.lo loadext.lo \
184184
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
185185
memdb.lo memjournal.lo \
186186
mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
@@ -234,6 +234,7 @@ SRC = \
234234
$(TOP)/src/hash.h \
235235
$(TOP)/src/hwtime.h \
236236
$(TOP)/src/insert.c \
237+
$(TOP)/src/json.c \
237238
$(TOP)/src/legacy.c \
238239
$(TOP)/src/loadext.c \
239240
$(TOP)/src/main.c \
@@ -366,7 +367,6 @@ SRC += \
366367
$(TOP)/ext/rbu/sqlite3rbu.h \
367368
$(TOP)/ext/rbu/sqlite3rbu.c
368369
SRC += \
369-
$(TOP)/ext/misc/json1.c \
370370
$(TOP)/ext/misc/stmt.c
371371

372372
# Generated source code files
@@ -460,6 +460,7 @@ TESTSRC += \
460460
$(TOP)/ext/misc/normalize.c \
461461
$(TOP)/ext/misc/percentile.c \
462462
$(TOP)/ext/misc/prefixes.c \
463+
$(TOP)/ext/misc/qpvtab.c \
463464
$(TOP)/ext/misc/regexp.c \
464465
$(TOP)/ext/misc/remember.c \
465466
$(TOP)/ext/misc/series.c \
@@ -608,7 +609,7 @@ TESTOPTS = --verbose=file --output=test-out.txt
608609

609610
# Extra compiler options for various shell tools
610611
#
611-
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
612+
SHELL_OPT = -DSQLITE_ENABLE_FTS4
612613
#SHELL_OPT += -DSQLITE_ENABLE_FTS5
613614
SHELL_OPT += -DSQLITE_ENABLE_RTREE
614615
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
@@ -618,8 +619,8 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
618619
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
619620
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
620621
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
621-
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
622-
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
622+
FUZZERSHELL_OPT =
623+
FUZZCHECK_OPT = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
623624
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
624625
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
625626
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
@@ -873,6 +874,9 @@ hash.lo: $(TOP)/src/hash.c $(HDR)
873874
insert.lo: $(TOP)/src/insert.c $(HDR)
874875
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/insert.c
875876

877+
json.lo: $(TOP)/src/json.c
878+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/json.c
879+
876880
legacy.lo: $(TOP)/src/legacy.c $(HDR)
877881
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/legacy.c
878882

@@ -1176,9 +1180,6 @@ userauth.lo: $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
11761180
sqlite3session.lo: $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
11771181
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
11781182

1179-
json1.lo: $(TOP)/ext/misc/json1.c
1180-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
1181-
11821183
stmt.lo: $(TOP)/ext/misc/stmt.c
11831184
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c
11841185

‎Makefile.msc

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ SQLITE_TCL_DEP =
363363
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
364364
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
365365
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1
366-
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
367366
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
368367
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
369368
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
@@ -580,17 +579,17 @@ RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
580579
#
581580
!IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
582581
!IF "$(PLATFORM)"=="x86"
583-
CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
584-
SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
582+
CORE_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
583+
SHELL_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
585584
# <<mark>>
586-
TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
585+
TEST_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
587586
# <</mark>>
588587
!ELSE
589588
!IFNDEF PLATFORM
590-
CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
591-
SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
589+
CORE_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
590+
SHELL_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
592591
# <<mark>>
593-
TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
592+
TEST_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
594593
# <</mark>>
595594
!ELSE
596595
CORE_CCONV_OPTS =
@@ -1248,7 +1247,7 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
12481247
fts3_tokenize_vtab.lo fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
12491248
fts5.lo \
12501249
func.lo global.lo hash.lo \
1251-
icu.lo insert.lo json1.lo legacy.lo loadext.lo \
1250+
icu.lo insert.lo json.lo legacy.lo loadext.lo \
12521251
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
12531252
memdb.lo memjournal.lo \
12541253
mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
@@ -1315,6 +1314,7 @@ SRC00 = \
13151314
$(TOP)\src\global.c \
13161315
$(TOP)\src\hash.c \
13171316
$(TOP)\src\insert.c \
1317+
$(TOP)\src\json.c \
13181318
$(TOP)\src\legacy.c \
13191319
$(TOP)\src\loadext.c \
13201320
$(TOP)\src\main.c \
@@ -1445,7 +1445,6 @@ SRC07 = \
14451445
$(TOP)\ext\rtree\rtree.c \
14461446
$(TOP)\ext\session\sqlite3session.c \
14471447
$(TOP)\ext\rbu\sqlite3rbu.c \
1448-
$(TOP)\ext\misc\json1.c \
14491448
$(TOP)\ext\misc\stmt.c
14501449

14511450
# Extension header files, part 1.
@@ -1579,6 +1578,7 @@ TESTEXT = \
15791578
$(TOP)\ext\misc\normalize.c \
15801579
$(TOP)\ext\misc\percentile.c \
15811580
$(TOP)\ext\misc\prefixes.c \
1581+
$(TOP)\ext\misc\qpvtab.c \
15821582
$(TOP)\ext\misc\regexp.c \
15831583
$(TOP)\ext\misc\remember.c \
15841584
$(TOP)\ext\misc\series.c \
@@ -1695,9 +1695,9 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
16951695
# <<mark>>
16961696
# Extra compiler options for various test tools.
16971697
#
1698-
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
1699-
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
1700-
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1698+
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_FTS5
1699+
FUZZERSHELL_COMPILE_OPTS =
1700+
FUZZCHECK_OPTS = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
17011701
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
17021702
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS5
17031703
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
@@ -1990,6 +1990,9 @@ hash.lo: $(TOP)\src\hash.c $(HDR)
19901990
insert.lo: $(TOP)\src\insert.c $(HDR)
19911991
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\insert.c
19921992

1993+
json.lo: $(TOP)\src\json.c $(HDR)
1994+
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\json.c
1995+
19931996
legacy.lo: $(TOP)\src\legacy.c $(HDR)
19941997
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\legacy.c
19951998

@@ -2298,9 +2301,6 @@ fts3_unicode2.lo: $(TOP)\ext\fts3\fts3_unicode2.c $(HDR) $(EXTHDR)
22982301
fts3_write.lo: $(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
22992302
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
23002303

2301-
json1.lo: $(TOP)\ext\misc\json1.c $(HDR) $(EXTHDR)
2302-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\json1.c
2303-
23042304
stmt.lo: $(TOP)\ext\misc\stmt.c $(HDR) $(EXTHDR)
23052305
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\stmt.c
23062306

@@ -2392,7 +2392,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
23922392
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23932393
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23942394
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
2395-
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
23962395
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
23972396
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
23982397

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,11 @@ describes its purpose and role within the larger system.
309309
The `manifest` file at the root directory of the source tree
310310
contains either a SHA3-256 hash (for newer files) or a SHA1 hash (for
311311
older files) for every source file in the repository.
312-
The SHA3-256 hash of the `manifest`
313-
file itself is the official name of the version of the source tree that you
314-
have. The `manifest.uuid` file should contain the SHA3-256 hash of the
312+
The name of the version of the entire source tree is just the
313+
SHA3-256 hash of the `manifest` file itself, possibly with the
314+
last line of that file omitted if the last line begins with
315+
"`# Remove this line`".
316+
The `manifest.uuid` file should contain the SHA3-256 hash of the
315317
`manifest` file. If all of the above hash comparisons are correct, then
316318
you can be confident that your source tree is authentic and unadulterated.
317319

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.37.2
1+
3.38.2

‎autoconf/Makefile.msc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
285285
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
286286
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
287287
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1
288-
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
289288
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
290289
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
291290
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
@@ -502,12 +501,12 @@ RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
502501
#
503502
!IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
504503
!IF "$(PLATFORM)"=="x86"
505-
CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
506-
SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
504+
CORE_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
505+
SHELL_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
507506
!ELSE
508507
!IFNDEF PLATFORM
509-
CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
510-
SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
508+
CORE_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
509+
SHELL_CCONV_OPTS = -Gz -guard:cf -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
511510
!ELSE
512511
CORE_CCONV_OPTS =
513512
SHELL_CCONV_OPTS =

‎autoconf/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ may be specified in this manner as some require the amalgamation to be built
105105
with them enabled (see http://www.sqlite.org/compile.html). For example, the
106106
following will work:
107107

108-
"OPTS=-DSQLITE_ENABLE_STAT4=1 -DSQLITE_ENABLE_JSON1=1"
108+
"OPTS=-DSQLITE_ENABLE_STAT4=1 -DSQLITE_OMIT_JSON=1"
109109

110110
However, the following will not compile unless the amalgamation was built
111111
with it enabled:

‎autoconf/configure.ac

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,21 +173,6 @@ else
173173
fi
174174
#-----------------------------------------------------------------------
175175

176-
#-----------------------------------------------------------------------
177-
# --enable-json1
178-
#
179-
AC_ARG_ENABLE(json1, [AS_HELP_STRING(
180-
[--enable-json1], [include json1 support [default=yes]])],
181-
[],[enable_json1=yes])
182-
AC_MSG_CHECKING([JSON functions])
183-
if test x"$enable_json1" = "xyes"; then
184-
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_JSON1"
185-
AC_MSG_RESULT([enabled])
186-
else
187-
AC_MSG_RESULT([disabled])
188-
fi
189-
#-----------------------------------------------------------------------
190-
191176
#-----------------------------------------------------------------------
192177
# --enable-rtree
193178
#

0 commit comments

Comments
 (0)
0