Skip to content

Commit 3a1baab

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.38.2) into prerelease-integration
2 parents 45475c4 + 5ddd6e7 commit 3a1baab

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
@@ -201,7 +201,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
201201
fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
202202
fts5.lo \
203203
func.lo global.lo hash.lo \
204-
icu.lo insert.lo json1.lo legacy.lo loadext.lo \
204+
icu.lo insert.lo json.lo legacy.lo loadext.lo \
205205
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
206206
memdb.lo memjournal.lo \
207207
mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
@@ -256,6 +256,7 @@ SRC = \
256256
$(TOP)/src/hash.h \
257257
$(TOP)/src/hwtime.h \
258258
$(TOP)/src/insert.c \
259+
$(TOP)/src/json.c \
259260
$(TOP)/src/legacy.c \
260261
$(TOP)/src/loadext.c \
261262
$(TOP)/src/main.c \
@@ -388,7 +389,6 @@ SRC += \
388389
$(TOP)/ext/rbu/sqlite3rbu.h \
389390
$(TOP)/ext/rbu/sqlite3rbu.c
390391
SRC += \
391-
$(TOP)/ext/misc/json1.c \
392392
$(TOP)/ext/misc/stmt.c
393393

394394
# Generated source code files
@@ -482,6 +482,7 @@ TESTSRC += \
482482
$(TOP)/ext/misc/normalize.c \
483483
$(TOP)/ext/misc/percentile.c \
484484
$(TOP)/ext/misc/prefixes.c \
485+
$(TOP)/ext/misc/qpvtab.c \
485486
$(TOP)/ext/misc/regexp.c \
486487
$(TOP)/ext/misc/remember.c \
487488
$(TOP)/ext/misc/series.c \
@@ -630,7 +631,7 @@ TESTOPTS = --verbose=file --output=test-out.txt
630631

631632
# Extra compiler options for various shell tools
632633
#
633-
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
634+
SHELL_OPT = -DSQLITE_ENABLE_FTS4
634635
#SHELL_OPT += -DSQLITE_ENABLE_FTS5
635636
SHELL_OPT += -DSQLITE_ENABLE_RTREE
636637
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
@@ -640,8 +641,8 @@ SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
640641
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
641642
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
642643
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
643-
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
644-
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
644+
FUZZERSHELL_OPT =
645+
FUZZCHECK_OPT = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
645646
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
646647
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
647648
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
@@ -910,6 +911,9 @@ hash.lo: $(TOP)/src/hash.c $(HDR)
910911
insert.lo: $(TOP)/src/insert.c $(HDR)
911912
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/insert.c
912913

914+
json.lo: $(TOP)/src/json.c
915+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/json.c
916+
913917
legacy.lo: $(TOP)/src/legacy.c $(HDR)
914918
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/legacy.c
915919

@@ -1213,9 +1217,6 @@ userauth.lo: $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
12131217
sqlite3session.lo: $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
12141218
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
12151219

1216-
json1.lo: $(TOP)/ext/misc/json1.c
1217-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
1218-
12191220
stmt.lo: $(TOP)/ext/misc/stmt.c
12201221
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c
12211222

‎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 \
@@ -1323,6 +1322,7 @@ SRC00 = \
13231322
$(TOP)\src\global.c \
13241323
$(TOP)\src\hash.c \
13251324
$(TOP)\src\insert.c \
1325+
$(TOP)\src\json.c \
13261326
$(TOP)\src\legacy.c \
13271327
$(TOP)\src\loadext.c \
13281328
$(TOP)\src\main.c \
@@ -1453,7 +1453,6 @@ SRC07 = \
14531453
$(TOP)\ext\rtree\rtree.c \
14541454
$(TOP)\ext\session\sqlite3session.c \
14551455
$(TOP)\ext\rbu\sqlite3rbu.c \
1456-
$(TOP)\ext\misc\json1.c \
14571456
$(TOP)\ext\misc\stmt.c
14581457

14591458
# Extension header files, part 1.
@@ -1587,6 +1586,7 @@ TESTEXT = \
15871586
$(TOP)\ext\misc\normalize.c \
15881587
$(TOP)\ext\misc\percentile.c \
15891588
$(TOP)\ext\misc\prefixes.c \
1589+
$(TOP)\ext\misc\qpvtab.c \
15901590
$(TOP)\ext\misc\regexp.c \
15911591
$(TOP)\ext\misc\remember.c \
15921592
$(TOP)\ext\misc\series.c \
@@ -1703,9 +1703,9 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
17031703
# <<mark>>
17041704
# Extra compiler options for various test tools.
17051705
#
1706-
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
1707-
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
1708-
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1706+
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_FTS5
1707+
FUZZERSHELL_COMPILE_OPTS =
1708+
FUZZCHECK_OPTS = -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
17091709
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
17101710
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS5
17111711
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
@@ -1998,6 +1998,9 @@ hash.lo: $(TOP)\src\hash.c $(HDR)
19981998
insert.lo: $(TOP)\src\insert.c $(HDR)
19991999
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\insert.c
20002000

2001+
json.lo: $(TOP)\src\json.c $(HDR)
2002+
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\json.c
2003+
20012004
legacy.lo: $(TOP)\src\legacy.c $(HDR)
20022005
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\legacy.c
20032006

@@ -2306,9 +2309,6 @@ fts3_unicode2.lo: $(TOP)\ext\fts3\fts3_unicode2.c $(HDR) $(EXTHDR)
23062309
fts3_write.lo: $(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
23072310
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
23082311

2309-
json1.lo: $(TOP)\ext\misc\json1.c $(HDR) $(EXTHDR)
2310-
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\json1.c
2311-
23122312
stmt.lo: $(TOP)\ext\misc\stmt.c $(HDR) $(EXTHDR)
23132313
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\stmt.c
23142314

@@ -2400,7 +2400,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
24002400
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
24012401
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
24022402
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
2403-
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
24042403
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
24052404
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
24062405

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,11 @@ describes its purpose and role within the larger system.
471471
The `manifest` file at the root directory of the source tree
472472
contains either a SHA3-256 hash (for newer files) or a SHA1 hash (for
473473
older files) for every source file in the repository.
474-
The SHA3-256 hash of the `manifest`
475-
file itself is the official name of the version of the source tree that you
476-
have. The `manifest.uuid` file should contain the SHA3-256 hash of the
474+
The name of the version of the entire source tree is just the
475+
SHA3-256 hash of the `manifest` file itself, possibly with the
476+
last line of that file omitted if the last line begins with
477+
"`# Remove this line`".
478+
The `manifest.uuid` file should contain the SHA3-256 hash of the
477479
`manifest` file. If all of the above hash comparisons are correct, then
478480
you can be confident that your source tree is authentic and unadulterated.
479481

‎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)