Skip to content

Commit addaa4c

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.46.0) into prerelease-integration
2 parents 91520d4 + 58e90d6 commit addaa4c

File tree

199 files changed

+11223
-2183
lines changed

Some content is hidden

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

199 files changed

+11223
-2183
lines changed

‎Makefile.in‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,8 @@ TESTSRC = \
440440
$(TOP)/ext/recover/sqlite3recover.c \
441441
$(TOP)/ext/recover/dbdata.c \
442442
$(TOP)/ext/recover/test_recover.c \
443+
$(TOP)/ext/intck/test_intck.c \
444+
$(TOP)/ext/intck/sqlite3intck.c \
443445
$(TOP)/ext/rbu/test_rbu.c
444446

445447
# Statically linked extensions
@@ -837,7 +839,7 @@ has_tclsh85:
837839
touch .target_source
838840

839841
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl src-verify has_tclsh84
840-
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS)
842+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
841843
cp tsrc/sqlite3ext.h .
842844
cp $(TOP)/ext/session/sqlite3session.h .
843845

@@ -848,7 +850,7 @@ sqlite3r.c: sqlite3.c sqlite3r.h has_tclsh84
848850
cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
849851
cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
850852
cp $(TOP)/ext/recover/dbdata.c tsrc/
851-
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS)
853+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
852854

853855
sqlite3ext.h: .target_source
854856
cp tsrc/sqlite3ext.h .
@@ -1189,35 +1191,37 @@ keywordhash.h: $(TOP)/tool/mkkeywordhash.c
11891191
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
11901192
./mkkeywordhash$(BEXE) >keywordhash.h
11911193

1192-
# Source files that go into making shell.c
1193-
SHELL_SRC = \
1194-
$(TOP)/src/shell.c.in \
1195-
$(TOP)/ext/consio/console_io.c \
1196-
$(TOP)/ext/consio/console_io.h \
1197-
$(TOP)/ext/misc/appendvfs.c \
1198-
$(TOP)/ext/misc/completion.c \
1199-
$(TOP)/ext/misc/decimal.c \
1200-
$(TOP)/ext/misc/basexx.c \
1201-
$(TOP)/ext/misc/base64.c \
1202-
$(TOP)/ext/misc/base85.c \
1203-
$(TOP)/ext/misc/fileio.c \
1204-
$(TOP)/ext/misc/ieee754.c \
1205-
$(TOP)/ext/misc/regexp.c \
1206-
$(TOP)/ext/misc/series.c \
1207-
$(TOP)/ext/misc/shathree.c \
1208-
$(TOP)/ext/misc/sqlar.c \
1209-
$(TOP)/ext/misc/uint.c \
1210-
$(TOP)/ext/expert/sqlite3expert.c \
1211-
$(TOP)/ext/expert/sqlite3expert.h \
1212-
$(TOP)/ext/misc/zipfile.c \
1213-
$(TOP)/ext/misc/memtrace.c \
1214-
$(TOP)/ext/misc/pcachetrace.c \
1215-
$(TOP)/ext/recover/dbdata.c \
1216-
$(TOP)/ext/recover/sqlite3recover.c \
1217-
$(TOP)/ext/recover/sqlite3recover.h \
1218-
$(TOP)/src/test_windirent.c
1219-
1220-
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl has_tclsh84
1194+
# Source and header files that shell.c depends on
1195+
SHELL_DEP = \
1196+
$(TOP)/src/shell.c.in \
1197+
$(TOP)/ext/consio/console_io.c \
1198+
$(TOP)/ext/consio/console_io.h \
1199+
$(TOP)/ext/expert/sqlite3expert.c \
1200+
$(TOP)/ext/expert/sqlite3expert.h \
1201+
$(TOP)/ext/intck/sqlite3intck.c \
1202+
$(TOP)/ext/intck/sqlite3intck.h \
1203+
$(TOP)/ext/misc/appendvfs.c \
1204+
$(TOP)/ext/misc/base64.c \
1205+
$(TOP)/ext/misc/base85.c \
1206+
$(TOP)/ext/misc/completion.c \
1207+
$(TOP)/ext/misc/decimal.c \
1208+
$(TOP)/ext/misc/fileio.c \
1209+
$(TOP)/ext/misc/ieee754.c \
1210+
$(TOP)/ext/misc/memtrace.c \
1211+
$(TOP)/ext/misc/pcachetrace.c \
1212+
$(TOP)/ext/misc/regexp.c \
1213+
$(TOP)/ext/misc/series.c \
1214+
$(TOP)/ext/misc/shathree.c \
1215+
$(TOP)/ext/misc/sqlar.c \
1216+
$(TOP)/ext/misc/uint.c \
1217+
$(TOP)/ext/misc/zipfile.c \
1218+
$(TOP)/ext/recover/dbdata.c \
1219+
$(TOP)/ext/recover/sqlite3recover.c \
1220+
$(TOP)/ext/recover/sqlite3recover.h \
1221+
$(TOP)/src/test_windirent.c \
1222+
$(TOP)/src/test_windirent.h
1223+
1224+
shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl has_tclsh84
12211225
$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c
12221226

12231227

@@ -1345,9 +1349,9 @@ testfixture$(TEXE): has_tclsh85 $(TESTFIXTURE_SRC)
13451349
$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
13461350
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
13471351

1348-
coretestprogs: $(TESTPROGS)
1352+
coretestprogs: testfixture$(BEXE) sqlite3$(BEXE)
13491353

1350-
testprogs: coretestprogs srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
1354+
testprogs: $(TESTPROGS) srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
13511355

13521356
# A very detailed test running most or all test cases
13531357
fulltest: alltest fuzztest

‎Makefile.msc‎

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ USE_AMALGAMATION = 1
1818
!ENDIF
1919
# <</mark>>
2020

21+
# Optionally set EXTRA_SRC to a list of C files to append to
22+
# the generated sqlite3.c.
23+
#
24+
!IFNDEF EXTRA_SRC
25+
EXTRA_SRC =
26+
!ENDIF
27+
2128
# Set this non-0 to enable full warnings (-W4, etc) when compiling.
2229
#
2330
!IFNDEF USE_FULLWARN
@@ -1603,6 +1610,8 @@ TESTEXT = \
16031610
$(TOP)\ext\rtree\test_rtreedoc.c \
16041611
$(TOP)\ext\recover\sqlite3recover.c \
16051612
$(TOP)\ext\recover\test_recover.c \
1613+
$(TOP)\ext\intck\test_intck.c \
1614+
$(TOP)\ext\intck\sqlite3intck.c \
16061615
$(TOP)\ext\recover\dbdata.c
16071616

16081617
# If use of zlib is enabled, add the "zipfile.c" source file.
@@ -1921,7 +1930,7 @@ mptest: mptester.exe
19211930
echo > .target_source
19221931

19231932
sqlite3.c: .target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL) src-verify.exe
1924-
$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)
1933+
$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS) $(EXTRA_SRC)
19251934

19261935
sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
19271936
$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -2271,39 +2280,44 @@ mkkeywordhash.exe: $(TOP)\tool\mkkeywordhash.c
22712280
keywordhash.h: $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
22722281
.\mkkeywordhash.exe > keywordhash.h
22732282

2274-
# Source files that go into making shell.c
2275-
SHELL_SRC = \
2276-
$(TOP)\src\shell.c.in \
2277-
$(TOP)\ext\consio\console_io.c \
2278-
$(TOP)\ext\consio\console_io.h \
2279-
$(TOP)\ext\misc\appendvfs.c \
2280-
$(TOP)\ext\misc\completion.c \
2281-
$(TOP)\ext\misc\base64.c \
2282-
$(TOP)\ext\misc\base85.c \
2283-
$(TOP)\ext\misc\decimal.c \
2284-
$(TOP)\ext\misc\fileio.c \
2285-
$(TOP)\ext\misc\ieee754.c \
2286-
$(TOP)\ext\misc\regexp.c \
2287-
$(TOP)\ext\misc\series.c \
2288-
$(TOP)\ext\misc\shathree.c \
2289-
$(TOP)\ext\misc\uint.c \
2290-
$(TOP)\ext\expert\sqlite3expert.c \
2291-
$(TOP)\ext\expert\sqlite3expert.h \
2292-
$(TOP)\ext\misc\memtrace.c \
2293-
$(TOP)\ext\misc\pcachetrace.c \
2294-
$(TOP)\ext\recover\dbdata.c \
2295-
$(TOP)\ext\recover\sqlite3recover.c \
2296-
$(TOP)\ext\recover\sqlite3recover.h \
2297-
$(TOP)\src\test_windirent.c
2283+
# Source and header files that shell.c depends on
2284+
SHELL_DEP = \
2285+
$(TOP)\src\shell.c.in \
2286+
$(TOP)\ext\consio\console_io.c \
2287+
$(TOP)\ext\consio\console_io.h \
2288+
$(TOP)\ext\expert\sqlite3expert.c \
2289+
$(TOP)\ext\expert\sqlite3expert.h \
2290+
$(TOP)\ext\intck\sqlite3intck.c \
2291+
$(TOP)\ext\intck\sqlite3intck.h \
2292+
$(TOP)\ext\misc\appendvfs.c \
2293+
$(TOP)\ext\misc\base64.c \
2294+
$(TOP)\ext\misc\base85.c \
2295+
$(TOP)\ext\misc\completion.c \
2296+
$(TOP)\ext\misc\decimal.c \
2297+
$(TOP)\ext\misc\fileio.c \
2298+
$(TOP)\ext\misc\ieee754.c \
2299+
$(TOP)\ext\misc\memtrace.c \
2300+
$(TOP)\ext\misc\pcachetrace.c \
2301+
$(TOP)\ext\misc\regexp.c \
2302+
$(TOP)\ext\misc\series.c \
2303+
$(TOP)\ext\misc\shathree.c \
2304+
$(TOP)\ext\misc\sqlar.c \
2305+
$(TOP)\ext\misc\uint.c \
2306+
$(TOP)\ext\misc\zipfile.c \
2307+
$(TOP)\ext\recover\dbdata.c \
2308+
$(TOP)\ext\recover\sqlite3recover.c \
2309+
$(TOP)\ext\recover\sqlite3recover.h \
2310+
$(TOP)\src\test_windirent.c \
2311+
$(TOP)\src\test_windirent.h
22982312

22992313
# If use of zlib is enabled, add the "zipfile.c" source file.
23002314
#
23012315
!IF $(USE_ZLIB)!=0
2302-
SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
2303-
SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
2316+
SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\sqlar.c
2317+
SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
23042318
!ENDIF
23052319

2306-
shell.c: $(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
2320+
shell.c: $(SHELL_DEP) $(TOP)\tool\mkshellc.tcl
23072321
$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
23082322

23092323
zlib:
@@ -2490,9 +2504,9 @@ extensiontest: testfixture.exe testloadext.dll
24902504
tool-zip: testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe $(TOP)\tool\mktoolzip.tcl
24912505
.\testfixture.exe $(TOP)\tool\mktoolzip.tcl
24922506

2493-
coretestprogs: $(TESTPROGS)
2507+
coretestprogs: testfixture.exe sqlite3.exe
24942508

2495-
testprogs: coretestprogs srcck1.exe fuzzcheck.exe sessionfuzz.exe
2509+
testprogs: $(TESTPROGS) srcck1.exe fuzzcheck.exe sessionfuzz.exe
24962510

24972511
fulltest: alltest fuzztest
24982512

@@ -2547,7 +2561,7 @@ mdevtest:
25472561

25482562
# Testing for a release
25492563
#
2550-
releasetest: testfixture.exe fuzztest
2564+
releasetest: testfixture.exe
25512565
testfixture.exe $(TOP)\test\testrunner.tcl release
25522566

25532567

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.45.3
1+
3.46.0

‎art/icon-243x273.gif‎

24.1 KB
Loading

‎art/icon-80x90.gif‎

3.31 KB
Loading

‎autoconf/Makefile.msc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
TOP = .
1919

2020

21+
# Optionally set EXTRA_SRC to a list of C files to append to
22+
# the generated sqlite3.c.
23+
#
24+
!IFNDEF EXTRA_SRC
25+
EXTRA_SRC =
26+
!ENDIF
27+
2128
# Set this non-0 to enable full warnings (-W4, etc) when compiling.
2229
#
2330
!IFNDEF USE_FULLWARN

‎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.45.3])
22+
AC_INIT([sqlite],[3.46.0])
2323

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

‎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.71 for sqlcipher 3.45.3.
3+
# Generated by GNU Autoconf 2.71 for sqlcipher 3.46.0.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@ MAKEFLAGS=
618618
# Identity of this package.
619619
PACKAGE_NAME='sqlcipher'
620620
PACKAGE_TARNAME='sqlcipher'
621-
PACKAGE_VERSION='3.45.3'
622-
PACKAGE_STRING='sqlcipher 3.45.3'
621+
PACKAGE_VERSION='3.46.0'
622+
PACKAGE_STRING='sqlcipher 3.46.0'
623623
PACKAGE_BUGREPORT=''
624624
PACKAGE_URL=''
625625

@@ -1379,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
13791379
# Omit some internal or obsolete options to make the list less imposing.
13801380
# This message is too long to be a string in the A/UX 3.1 sh.
13811381
cat <<_ACEOF
1382-
\`configure' configures sqlcipher 3.45.3 to adapt to many kinds of systems.
1382+
\`configure' configures sqlcipher 3.46.0 to adapt to many kinds of systems.
13831383
13841384
Usage: $0 [OPTION]... [VAR=VALUE]...
13851385
@@ -1445,7 +1445,7 @@ fi
14451445

14461446
if test -n "$ac_init_help"; then
14471447
case $ac_init_help in
1448-
short | recursive ) echo "Configuration of sqlcipher 3.45.3:";;
1448+
short | recursive ) echo "Configuration of sqlcipher 3.46.0:";;
14491449
esac
14501450
cat <<\_ACEOF
14511451
@@ -1588,7 +1588,7 @@ fi
15881588
test -n "$ac_init_help" && exit $ac_status
15891589
if $ac_init_version; then
15901590
cat <<\_ACEOF
1591-
sqlcipher configure 3.45.3
1591+
sqlcipher configure 3.46.0
15921592
generated by GNU Autoconf 2.71
15931593
15941594
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1863,7 +1863,7 @@ cat >config.log <<_ACEOF
18631863
This file contains any messages produced by compilers while
18641864
running configure, to aid debugging if configure makes a mistake.
18651865
1866-
It was created by sqlcipher $as_me 3.45.3, which was
1866+
It was created by sqlcipher $as_me 3.46.0, which was
18671867
generated by GNU Autoconf 2.71. Invocation command line was
18681868
18691869
$ $0$ac_configure_args_raw
@@ -14684,7 +14684,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1468414684
# report actual input values of CONFIG_FILES etc. instead of their
1468514685
# values after options handling.
1468614686
ac_log="
14687-
This file was extended by sqlcipher $as_me 3.45.3, which was
14687+
This file was extended by sqlcipher $as_me 3.46.0, which was
1468814688
generated by GNU Autoconf 2.71. Invocation command line was
1468914689
1469014690
CONFIG_FILES = $CONFIG_FILES
@@ -14752,7 +14752,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
1475214752
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1475314753
ac_cs_config='$ac_cs_config_escaped'
1475414754
ac_cs_version="\\
14755-
sqlcipher config.status 3.45.3
14755+
sqlcipher config.status 3.46.0
1475614756
configured by $0, generated by GNU Autoconf 2.71,
1475714757
with options \\"\$ac_cs_config\\"
1475814758

‎doc/lemon.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ <h3>4.4 Special Directives</h3>
683683
<li><tt><a href='#pifdef'>%endif</a></tt>
684684
<li><tt><a href='#extraarg'>%extra_argument</a></tt>
685685
<li><tt><a href='#pfallback'>%fallback</a></tt>
686+
<li><tt><a href='#reallc'>%free</a></tt>
686687
<li><tt><a href='#pifdef'>%if</a></tt>
687688
<li><tt><a href='#pifdef'>%ifdef</a></tt>
688689
<li><tt><a href='#pifdef'>%ifndef</a></tt>
@@ -693,6 +694,7 @@ <h3>4.4 Special Directives</h3>
693694
<li><tt><a href='#parse_accept'>%parse_accept</a></tt>
694695
<li><tt><a href='#parse_failure'>%parse_failure</a></tt>
695696
<li><tt><a href='#pright'>%right</a></tt>
697+
<li><tt><a href='#reallc'>%realloc</a></tt>
696698
<li><tt><a href='#stack_overflow'>%stack_overflow</a></tt>
697699
<li><tt><a href='#stack_size'>%stack_size</a></tt>
698700
<li><tt><a href='#start_symbol'>%start_symbol</a></tt>
@@ -1200,6 +1202,21 @@ <h4>4.4.25 The <tt>%wildcard</tt> directive</h4>
12001202
the wildcard token and some other token, the other token is always used.
12011203
The wildcard token is only matched if there are no alternatives.</p>
12021204

1205+
<a id='reallc'></a>
1206+
<h4>4.4.26 The <tt>%realloc</tt> and <tt>%free</tt> directives</h4>
1207+
1208+
<p>The <tt>%realloc</tt> and <tt>%free</tt> directives defines function
1209+
that allocate and free heap memory. The signatures of these functions
1210+
should be the same as the realloc() and free() functions from the standard
1211+
C library.
1212+
1213+
<p>If both of these functions are defined
1214+
then these functions are used to allocate and free
1215+
memory for supplemental parser stack space, if the initial
1216+
parse stack space is exceeded. The initial parser stack size
1217+
is specified by either <tt>%stack_size</tt> or the
1218+
-DYYSTACKDEPTH compile-time flag.
1219+
12031220
<a id='errors'></a>
12041221
<h2>5.0 Error Processing</h2>
12051222

@@ -1224,6 +1241,7 @@ <h2>5.0 Error Processing</h2>
12241241
first syntax error, of course, if there are no instances of the
12251242
"error" non-terminal in your grammar.</p>
12261243

1244+
12271245
<a id='history'></a>
12281246
<h2>6.0 History of Lemon</h2>
12291247

0 commit comments

Comments
 (0)