Skip to content

Commit 58e90d6

Browse files
sjlombardosjlombardo
committed
Snapshot of upstream SQLite 3.46.0
1 parent 7b69f52 commit 58e90d6

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
@@ -418,6 +418,8 @@ TESTSRC = \
418418
$(TOP)/ext/recover/sqlite3recover.c \
419419
$(TOP)/ext/recover/dbdata.c \
420420
$(TOP)/ext/recover/test_recover.c \
421+
$(TOP)/ext/intck/test_intck.c \
422+
$(TOP)/ext/intck/sqlite3intck.c \
421423
$(TOP)/ext/rbu/test_rbu.c
422424

423425
# Statically linked extensions
@@ -815,7 +817,7 @@ has_tclsh85:
815817
touch .target_source
816818

817819
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl src-verify has_tclsh84
818-
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS)
820+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
819821
cp tsrc/sqlite3ext.h .
820822
cp $(TOP)/ext/session/sqlite3session.h .
821823

@@ -826,7 +828,7 @@ sqlite3r.c: sqlite3.c sqlite3r.h has_tclsh84
826828
cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
827829
cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
828830
cp $(TOP)/ext/recover/dbdata.c tsrc/
829-
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS)
831+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
830832

831833
sqlite3ext.h: .target_source
832834
cp tsrc/sqlite3ext.h .
@@ -1152,35 +1154,37 @@ keywordhash.h: $(TOP)/tool/mkkeywordhash.c
11521154
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
11531155
./mkkeywordhash$(BEXE) >keywordhash.h
11541156

1155-
# Source files that go into making shell.c
1156-
SHELL_SRC = \
1157-
$(TOP)/src/shell.c.in \
1158-
$(TOP)/ext/consio/console_io.c \
1159-
$(TOP)/ext/consio/console_io.h \
1160-
$(TOP)/ext/misc/appendvfs.c \
1161-
$(TOP)/ext/misc/completion.c \
1162-
$(TOP)/ext/misc/decimal.c \
1163-
$(TOP)/ext/misc/basexx.c \
1164-
$(TOP)/ext/misc/base64.c \
1165-
$(TOP)/ext/misc/base85.c \
1166-
$(TOP)/ext/misc/fileio.c \
1167-
$(TOP)/ext/misc/ieee754.c \
1168-
$(TOP)/ext/misc/regexp.c \
1169-
$(TOP)/ext/misc/series.c \
1170-
$(TOP)/ext/misc/shathree.c \
1171-
$(TOP)/ext/misc/sqlar.c \
1172-
$(TOP)/ext/misc/uint.c \
1173-
$(TOP)/ext/expert/sqlite3expert.c \
1174-
$(TOP)/ext/expert/sqlite3expert.h \
1175-
$(TOP)/ext/misc/zipfile.c \
1176-
$(TOP)/ext/misc/memtrace.c \
1177-
$(TOP)/ext/misc/pcachetrace.c \
1178-
$(TOP)/ext/recover/dbdata.c \
1179-
$(TOP)/ext/recover/sqlite3recover.c \
1180-
$(TOP)/ext/recover/sqlite3recover.h \
1181-
$(TOP)/src/test_windirent.c
1182-
1183-
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl has_tclsh84
1157+
# Source and header files that shell.c depends on
1158+
SHELL_DEP = \
1159+
$(TOP)/src/shell.c.in \
1160+
$(TOP)/ext/consio/console_io.c \
1161+
$(TOP)/ext/consio/console_io.h \
1162+
$(TOP)/ext/expert/sqlite3expert.c \
1163+
$(TOP)/ext/expert/sqlite3expert.h \
1164+
$(TOP)/ext/intck/sqlite3intck.c \
1165+
$(TOP)/ext/intck/sqlite3intck.h \
1166+
$(TOP)/ext/misc/appendvfs.c \
1167+
$(TOP)/ext/misc/base64.c \
1168+
$(TOP)/ext/misc/base85.c \
1169+
$(TOP)/ext/misc/completion.c \
1170+
$(TOP)/ext/misc/decimal.c \
1171+
$(TOP)/ext/misc/fileio.c \
1172+
$(TOP)/ext/misc/ieee754.c \
1173+
$(TOP)/ext/misc/memtrace.c \
1174+
$(TOP)/ext/misc/pcachetrace.c \
1175+
$(TOP)/ext/misc/regexp.c \
1176+
$(TOP)/ext/misc/series.c \
1177+
$(TOP)/ext/misc/shathree.c \
1178+
$(TOP)/ext/misc/sqlar.c \
1179+
$(TOP)/ext/misc/uint.c \
1180+
$(TOP)/ext/misc/zipfile.c \
1181+
$(TOP)/ext/recover/dbdata.c \
1182+
$(TOP)/ext/recover/sqlite3recover.c \
1183+
$(TOP)/ext/recover/sqlite3recover.h \
1184+
$(TOP)/src/test_windirent.c \
1185+
$(TOP)/src/test_windirent.h
1186+
1187+
shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl has_tclsh84
11841188
$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c
11851189

11861190

@@ -1308,9 +1312,9 @@ testfixture$(TEXE): has_tclsh85 $(TESTFIXTURE_SRC)
13081312
$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
13091313
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
13101314

1311-
coretestprogs: $(TESTPROGS)
1315+
coretestprogs: testfixture$(BEXE) sqlite3$(BEXE)
13121316

1313-
testprogs: coretestprogs srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
1317+
testprogs: $(TESTPROGS) srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
13141318

13151319
# A very detailed test running most or all test cases
13161320
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
@@ -1595,6 +1602,8 @@ TESTEXT = \
15951602
$(TOP)\ext\rtree\test_rtreedoc.c \
15961603
$(TOP)\ext\recover\sqlite3recover.c \
15971604
$(TOP)\ext\recover\test_recover.c \
1605+
$(TOP)\ext\intck\test_intck.c \
1606+
$(TOP)\ext\intck\sqlite3intck.c \
15981607
$(TOP)\ext\recover\dbdata.c
15991608

16001609
# If use of zlib is enabled, add the "zipfile.c" source file.
@@ -1913,7 +1922,7 @@ mptest: mptester.exe
19131922
echo > .target_source
19141923

19151924
sqlite3.c: .target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL) src-verify.exe
1916-
$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)
1925+
$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS) $(EXTRA_SRC)
19171926

19181927
sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
19191928
$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -2263,39 +2272,44 @@ mkkeywordhash.exe: $(TOP)\tool\mkkeywordhash.c
22632272
keywordhash.h: $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
22642273
.\mkkeywordhash.exe > keywordhash.h
22652274

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

22912305
# If use of zlib is enabled, add the "zipfile.c" source file.
22922306
#
22932307
!IF $(USE_ZLIB)!=0
2294-
SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
2295-
SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
2308+
SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\sqlar.c
2309+
SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
22962310
!ENDIF
22972311

2298-
shell.c: $(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
2312+
shell.c: $(SHELL_DEP) $(TOP)\tool\mkshellc.tcl
22992313
$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
23002314

23012315
zlib:
@@ -2482,9 +2496,9 @@ extensiontest: testfixture.exe testloadext.dll
24822496
tool-zip: testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe $(TOP)\tool\mktoolzip.tcl
24832497
.\testfixture.exe $(TOP)\tool\mktoolzip.tcl
24842498

2485-
coretestprogs: $(TESTPROGS)
2499+
coretestprogs: testfixture.exe sqlite3.exe
24862500

2487-
testprogs: coretestprogs srcck1.exe fuzzcheck.exe sessionfuzz.exe
2501+
testprogs: $(TESTPROGS) srcck1.exe fuzzcheck.exe sessionfuzz.exe
24882502

24892503
fulltest: alltest fuzztest
24902504

@@ -2539,7 +2553,7 @@ mdevtest:
25392553

25402554
# Testing for a release
25412555
#
2542-
releasetest: testfixture.exe fuzztest
2556+
releasetest: testfixture.exe
25432557
testfixture.exe $(TOP)\test\testrunner.tcl release
25442558

25452559

‎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.69 for sqlite 3.45.3.
3+
# Generated by GNU Autoconf 2.69 for sqlite 3.46.0.
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.45.3'
730-
PACKAGE_STRING='sqlite 3.45.3'
729+
PACKAGE_VERSION='3.46.0'
730+
PACKAGE_STRING='sqlite 3.46.0'
731731
PACKAGE_BUGREPORT=''
732732
PACKAGE_URL=''
733733

@@ -1472,7 +1472,7 @@ if test "$ac_init_help" = "long"; then
14721472
# Omit some internal or obsolete options to make the list less imposing.
14731473
# This message is too long to be a string in the A/UX 3.1 sh.
14741474
cat <<_ACEOF
1475-
\`configure' configures sqlite 3.45.3 to adapt to many kinds of systems.
1475+
\`configure' configures sqlite 3.46.0 to adapt to many kinds of systems.
14761476
14771477
Usage: $0 [OPTION]... [VAR=VALUE]...
14781478
@@ -1537,7 +1537,7 @@ fi
15371537

15381538
if test -n "$ac_init_help"; then
15391539
case $ac_init_help in
1540-
short | recursive ) echo "Configuration of sqlite 3.45.3:";;
1540+
short | recursive ) echo "Configuration of sqlite 3.46.0:";;
15411541
esac
15421542
cat <<\_ACEOF
15431543
@@ -1668,7 +1668,7 @@ fi
16681668
test -n "$ac_init_help" && exit $ac_status
16691669
if $ac_init_version; then
16701670
cat <<\_ACEOF
1671-
sqlite configure 3.45.3
1671+
sqlite configure 3.46.0
16721672
generated by GNU Autoconf 2.69
16731673
16741674
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2087,7 +2087,7 @@ cat >config.log <<_ACEOF
20872087
This file contains any messages produced by compilers while
20882088
running configure, to aid debugging if configure makes a mistake.
20892089
2090-
It was created by sqlite $as_me 3.45.3, which was
2090+
It was created by sqlite $as_me 3.46.0, which was
20912091
generated by GNU Autoconf 2.69. Invocation command line was
20922092
20932093
$ $0 $@
@@ -12481,7 +12481,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1248112481
# report actual input values of CONFIG_FILES etc. instead of their
1248212482
# values after options handling.
1248312483
ac_log="
12484-
This file was extended by sqlite $as_me 3.45.3, which was
12484+
This file was extended by sqlite $as_me 3.46.0, which was
1248512485
generated by GNU Autoconf 2.69. Invocation command line was
1248612486
1248712487
CONFIG_FILES = $CONFIG_FILES
@@ -12547,7 +12547,7 @@ _ACEOF
1254712547
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1254812548
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1254912549
ac_cs_version="\\
12550-
sqlite config.status 3.45.3
12550+
sqlite config.status 3.46.0
1255112551
configured by $0, generated by GNU Autoconf 2.69,
1255212552
with options \\"\$ac_cs_config\\"
1255312553

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