Skip to content

Commit be789e9

Browse files
developernotesdevelopernotes
committed
Merge sqlite-release(3.20.1) into prerelease-integration
2 parents 895a4c7 + 1f3bc22 commit be789e9

File tree

484 files changed

+69423
-7237
lines changed

Some content is hidden

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

484 files changed

+69423
-7237
lines changed

‎Makefile.in‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
200200
notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
201201
pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
202202
random.lo resolve.lo rowset.lo rtree.lo \
203-
sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
203+
sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
204204
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
205205
update.lo util.lo vacuum.lo \
206206
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
@@ -370,7 +370,8 @@ SRC += \
370370
$(TOP)/ext/rbu/sqlite3rbu.h \
371371
$(TOP)/ext/rbu/sqlite3rbu.c
372372
SRC += \
373-
$(TOP)/ext/misc/json1.c
373+
$(TOP)/ext/misc/json1.c \
374+
$(TOP)/ext/misc/stmt.c
374375

375376
# Generated source code files
376377
#
@@ -450,9 +451,11 @@ TESTSRC += \
450451
$(TOP)/ext/misc/nextchar.c \
451452
$(TOP)/ext/misc/percentile.c \
452453
$(TOP)/ext/misc/regexp.c \
454+
$(TOP)/ext/misc/remember.c \
453455
$(TOP)/ext/misc/series.c \
454456
$(TOP)/ext/misc/spellfix.c \
455457
$(TOP)/ext/misc/totype.c \
458+
$(TOP)/ext/misc/unionvtab.c \
456459
$(TOP)/ext/misc/wholenumber.c
457460

458461
# Source code to the library files needed by the test fixture
@@ -502,7 +505,8 @@ TESTSRC2 = \
502505
$(TOP)/ext/fts3/fts3_tokenizer.c \
503506
$(TOP)/ext/fts3/fts3_write.c \
504507
$(TOP)/ext/async/sqlite3async.c \
505-
$(TOP)/ext/session/sqlite3session.c
508+
$(TOP)/ext/session/sqlite3session.c \
509+
$(TOP)/ext/misc/stmt.c
506510

507511
# Header files used by all library source files.
508512
#
@@ -570,7 +574,8 @@ FUZZDATA = \
570574
$(TOP)/test/fuzzdata1.db \
571575
$(TOP)/test/fuzzdata2.db \
572576
$(TOP)/test/fuzzdata3.db \
573-
$(TOP)/test/fuzzdata4.db
577+
$(TOP)/test/fuzzdata4.db \
578+
$(TOP)/test/fuzzdata5.db
574579

575580
# Standard options to testfixture
576581
#
@@ -582,8 +587,12 @@ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
582587
# SHELL_OPT += -DSQLITE_ENABLE_FTS5
583588
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
584589
SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
590+
SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
585591
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
586-
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
592+
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
593+
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
594+
FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
595+
DBFUZZ_OPT =
587596

588597
# This is the default Makefile target. The objects listed here
589598
# are what get build when you type just "make" with no arguments.
@@ -632,8 +641,15 @@ fuzzershell$(TEXE): $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
632641
$(LTLINK) -o $@ $(FUZZERSHELL_OPT) \
633642
$(TOP)/tool/fuzzershell.c sqlite3.c $(TLIBS)
634643

635-
fuzzcheck$(TEXE): $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h
636-
$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/fuzzcheck.c sqlite3.c $(TLIBS)
644+
fuzzcheck$(TEXE): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h
645+
$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(TLIBS)
646+
647+
ossshell$(TEXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
648+
$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \
649+
$(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS)
650+
651+
dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
652+
$(LTLINK) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(TLIBS)
637653

638654
mptester$(TEXE): sqlite3.lo $(TOP)/mptest/mptest.c
639655
$(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.lo \
@@ -1055,6 +1071,9 @@ sqlite3session.lo: $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
10551071
json1.lo: $(TOP)/ext/misc/json1.c
10561072
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
10571073

1074+
stmt.lo: $(TOP)/ext/misc/stmt.c
1075+
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c
1076+
10581077
# FTS5 things
10591078
#
10601079
FTS5_SRC = \
@@ -1104,6 +1123,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
11041123
TESTFIXTURE_FLAGS += -DBUILD_sqlite
11051124
TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
11061125
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
1126+
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
11071127

11081128
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
11091129
TESTFIXTURE_SRC1 = sqlite3.c
@@ -1136,6 +1156,11 @@ fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
11361156
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
11371157
valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
11381158

1159+
# The veryquick.test TCL tests.
1160+
#
1161+
tcltest: ./testfixture$(TEXE)
1162+
./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
1163+
11391164
# Minimal testing that runs in less than 3 minutes
11401165
#
11411166
quicktest: ./testfixture$(TEXE)
@@ -1144,8 +1169,7 @@ quicktest: ./testfixture$(TEXE)
11441169
# This is the common case. Run many tests that do not take too long,
11451170
# including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
11461171
#
1147-
test: $(TESTPROGS) sourcetest fastfuzztest
1148-
./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
1172+
test: fastfuzztest sourcetest $(TESTPROGS) tcltest
11491173

11501174
# Run a test using valgrind. This can take a really long time
11511175
# because valgrind is so much slower than a native machine.
@@ -1172,6 +1196,10 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
11721196
sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
11731197
$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
11741198

1199+
dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
1200+
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
1201+
$(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
1202+
11751203
showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
11761204
$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
11771205

@@ -1196,8 +1224,13 @@ LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h
11961224
wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.lo
11971225
$(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.lo $(TLIBS)
11981226

1199-
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo
1200-
$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
1227+
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.c
1228+
$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)
1229+
1230+
KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ
1231+
1232+
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
1233+
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
12011234

12021235
rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
12031236
$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)

‎Makefile.msc‎

Lines changed: 71 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ USE_AMALGAMATION = 1
2121
# Set this non-0 to enable full warnings (-W4, etc) when compiling.
2222
#
2323
!IFNDEF USE_FULLWARN
24-
USE_FULLWARN = 0
24+
USE_FULLWARN = 1
25+
!ENDIF
26+
27+
# Set this non-0 to enable treating warnings as errors (-WX, etc) when
28+
# compiling.
29+
#
30+
!IFNDEF USE_FATAL_WARN
31+
USE_FATAL_WARN = 0
2532
!ENDIF
2633

2734
# Set this non-0 to enable full runtime error checks (-RTC1, etc). This
@@ -493,6 +500,12 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS)
493500
TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
494501
!ENDIF
495502

503+
# Check if warnings should be treated as errors when compiling.
504+
#
505+
!IF $(USE_FATAL_WARN)!=0
506+
TCC = $(TCC) -WX
507+
!ENDIF
508+
496509
TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src -fp:precise
497510
RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
498511

@@ -733,6 +746,10 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
733746
!IF $(DEBUG)>2
734747
TCC = $(TCC) -DSQLITE_DEBUG=1
735748
RCC = $(RCC) -DSQLITE_DEBUG=1
749+
!IF $(DYNAMIC_SHELL)==0
750+
TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
751+
RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
752+
!ENDIF
736753
!ENDIF
737754

738755
!IF $(DEBUG)>4 || $(OSTRACE)!=0
@@ -1284,7 +1301,8 @@ SRC07 = \
12841301
$(TOP)\ext\rtree\rtree.c \
12851302
$(TOP)\ext\session\sqlite3session.c \
12861303
$(TOP)\ext\rbu\sqlite3rbu.c \
1287-
$(TOP)\ext\misc\json1.c
1304+
$(TOP)\ext\misc\json1.c \
1305+
$(TOP)\ext\misc\stmt.c
12881306

12891307
# Extension header files, part 1.
12901308
#
@@ -1403,9 +1421,11 @@ TESTEXT = \
14031421
$(TOP)\ext\misc\nextchar.c \
14041422
$(TOP)\ext\misc\percentile.c \
14051423
$(TOP)\ext\misc\regexp.c \
1424+
$(TOP)\ext\misc\remember.c \
14061425
$(TOP)\ext\misc\series.c \
14071426
$(TOP)\ext\misc\spellfix.c \
14081427
$(TOP)\ext\misc\totype.c \
1428+
$(TOP)\ext\misc\unionvtab.c \
14091429
$(TOP)\ext\misc\wholenumber.c
14101430

14111431
# Source code to the library files needed by the test fixture
@@ -1486,22 +1506,29 @@ FUZZDATA = \
14861506
$(TOP)\test\fuzzdata1.db \
14871507
$(TOP)\test\fuzzdata2.db \
14881508
$(TOP)\test\fuzzdata3.db \
1489-
$(TOP)\test\fuzzdata4.db
1509+
$(TOP)\test\fuzzdata4.db \
1510+
$(TOP)\test\fuzzdata5.db
14901511
# <</mark>>
14911512

14921513
# Additional compiler options for the shell. These are only effective
14931514
# when the shell is not being dynamically linked.
14941515
#
14951516
!IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
1496-
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
1517+
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
14971518
!ENDIF
14981519

14991520
# <<mark>>
15001521
# Extra compiler options for various test tools.
15011522
#
15021523
MPTESTER_COMPILE_OPTS = -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS5
15031524
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
1504-
FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
1525+
FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000
1526+
FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
1527+
OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
1528+
DBFUZZ_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
1529+
KV_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
1530+
DBSELFTEST_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
1531+
ST_COMPILE_OPTS = -DSQLITE_THREADSAFE=0
15051532

15061533
# Standard options to testfixture.
15071534
#
@@ -1544,7 +1571,7 @@ $(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
15441571
sqlite3.def: libsqlite3.lib
15451572
echo EXPORTS > sqlite3.def
15461573
dumpbin /all libsqlite3.lib \
1547-
| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_[^@]*)(?:@\d+)?$$" \1 \
1574+
| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3(?:session|changeset|changegroup)?_[^@]*)(?:@\d+)?$$" \1 \
15481575
| sort >> sqlite3.def
15491576
# <</block2>>
15501577

@@ -1571,8 +1598,14 @@ sourcetest: srcck1.exe sqlite3.c
15711598
fuzzershell.exe: $(TOP)\tool\fuzzershell.c $(SQLITE3C) $(SQLITE3H)
15721599
$(LTLINK) $(NO_WARN) $(FUZZERSHELL_COMPILE_OPTS) $(TOP)\tool\fuzzershell.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
15731600

1574-
fuzzcheck.exe: $(TOP)\test\fuzzcheck.c $(SQLITE3C) $(SQLITE3H)
1575-
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(TOP)\test\fuzzcheck.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1601+
dbfuzz.exe: $(TOP)\test\dbfuzz.c $(SQLITE3C) $(SQLITE3H)
1602+
$(LTLINK) $(NO_WARN) $(DBFUZZ_COMPILE_OPTS) $(TOP)\test\dbfuzz.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1603+
1604+
fuzzcheck.exe: $(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
1605+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1606+
1607+
ossshell.exe: $(OSSSHELL_SRC) $(SQLITE3C) $(SQLITE3H)
1608+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
15761609

15771610
mptester.exe: $(TOP)\mptest\mptest.c $(SQLITE3C) $(SQLITE3H)
15781611
$(LTLINK) $(NO_WARN) $(MPTESTER_COMPILE_OPTS) $(TOP)\mptest\mptest.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@@ -2065,6 +2098,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
20652098
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
20662099
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
20672100
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
2101+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB
20682102
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
20692103

20702104
TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -2157,55 +2191,70 @@ sqlite3_analyzer.exe: sqlite3_analyzer.c $(LIBRESOBJS)
21572191
$(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqlite3_analyzer.c \
21582192
/link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
21592193

2194+
dbdump.exe: $(TOP)\ext\misc\dbdump.c $(SQLITE3C) $(SQLITE3H)
2195+
$(LTLINK) $(NO_WARN) -DDBDUMP_STANDALONE $(TOP)\ext\misc\dbdump.c $(SQLITE3C) \
2196+
/link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS)
2197+
21602198
testloadext.lo: $(TOP)\src\test_loadext.c
21612199
$(LTCOMPILE) $(NO_WARN) -c $(TOP)\src\test_loadext.c
21622200

21632201
testloadext.dll: testloadext.lo
21642202
$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ testloadext.lo
21652203

21662204
showdb.exe: $(TOP)\tool\showdb.c $(SQLITE3C) $(SQLITE3H)
2167-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2205+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21682206
$(TOP)\tool\showdb.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21692207

21702208
showstat4.exe: $(TOP)\tool\showstat4.c $(SQLITE3C) $(SQLITE3H)
2171-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2209+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21722210
$(TOP)\tool\showstat4.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21732211

21742212
showjournal.exe: $(TOP)\tool\showjournal.c $(SQLITE3C) $(SQLITE3H)
2175-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2213+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21762214
$(TOP)\tool\showjournal.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21772215

21782216
showwal.exe: $(TOP)\tool\showwal.c $(SQLITE3C) $(SQLITE3H)
2179-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2217+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21802218
$(TOP)\tool\showwal.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21812219

2182-
changeset.exe: $(TOP)\ext\session\changeset.c $(SQLITE3C)
2183-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2220+
changeset.exe: $(TOP)\ext\session\changeset.c $(SQLITE3C) $(SQLITE3H)
2221+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
2222+
-DSQLITE_ENABLE_SESSION=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 \
21842223
$(TOP)\ext\session\changeset.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21852224

21862225
fts3view.exe: $(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) $(SQLITE3H)
2187-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2226+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21882227
$(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21892228

21902229
rollback-test.exe: $(TOP)\tool\rollback-test.c $(SQLITE3C) $(SQLITE3H)
2191-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2230+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21922231
$(TOP)\tool\rollback-test.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
21932232

21942233
LogEst.exe: $(TOP)\tool\logest.c $(SQLITE3H)
2195-
$(LTLINK) $(NO_WARN) -Fe$@ $(TOP)\tool\LogEst.c /link $(LDFLAGS) $(LTLINKOPTS)
2234+
$(LTLINK) $(NO_WARN) $(TOP)\tool\LogEst.c /link $(LDFLAGS) $(LTLINKOPTS)
21962235

21972236
wordcount.exe: $(TOP)\test\wordcount.c $(SQLITE3C) $(SQLITE3H)
2198-
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2237+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
21992238
$(TOP)\test\wordcount.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
22002239

22012240
speedtest1.exe: $(TOP)\test\speedtest1.c $(SQLITE3C) $(SQLITE3H)
2202-
$(LTLINK) $(NO_WARN) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
2241+
$(LTLINK) $(NO_WARN) $(ST_COMPILE_OPTS) -DSQLITE_OMIT_LOAD_EXTENSION \
22032242
$(TOP)\test\speedtest1.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
22042243

2244+
kvtest.exe: $(TOP)\test\kvtest.c $(SQLITE3C) $(SQLITE3H)
2245+
$(LTLINK) $(NO_WARN) $(KV_COMPILE_OPTS) \
2246+
$(TOP)\test\kvtest.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
2247+
2248+
dbselftest.exe: $(TOP)\test\dbselftest.c $(SQLITE3C) $(SQLITE3H)
2249+
$(LTLINK) $(NO_WARN) $(DBSELFTEST_COMPILE_OPTS) $(TOP)\test\dbselftest.c $(SQLITE3C)
2250+
22052251
rbu.exe: $(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H)
2206-
$(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU -Fe$@ \
2252+
$(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU \
22072253
$(TOP)\ext\rbu\rbu.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
22082254

2255+
LSMDIR=$(TOP)\ext\lsm1
2256+
!INCLUDE $(LSMDIR)\Makefile.msc
2257+
22092258
moreclean: clean
22102259
del /Q $(SQLITE3C) $(SQLITE3H) 2>NUL
22112260
# <</mark>>
@@ -2225,9 +2274,10 @@ clean:
22252274
-rmdir /Q/S tsrc 2>NUL
22262275
del /Q .target_source 2>NUL
22272276
del /Q tclsqlite3.exe $(SQLITETCLH) $(SQLITETCLDECLSH) 2>NUL
2277+
del /Q lsm.dll lsmtest.exe 2>NUL
22282278
del /Q testloadext.dll 2>NUL
22292279
del /Q testfixture.exe test.db 2>NUL
2230-
del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe 2>NUL
2280+
del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe dbdump.exe 2>NUL
22312281
del /Q changeset.exe 2>NUL
22322282
del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe 2>NUL
22332283
del /Q mptester.exe wordcount.exe rbu.exe srcck1.exe 2>NUL

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.15.2
1+
3.20.1

0 commit comments

Comments
 (0)