Skip to content

Commit 297e94d

Browse files
developernotesdevelopernotes
committed
Merge sqlite-release(3.7.17) into prerelease-integration
Conflicts: src/pragma.c
2 parents ed1e161 + 67300df commit 297e94d

254 files changed

Lines changed: 22949 additions & 2163 deletions

File tree

Some content is hidden

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

‎Makefile.in‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
179179
expr.lo fault.lo fkey.lo \
180180
fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
181181
fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
182+
fts3_tokenize_vtab.lo \
182183
fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
183184
func.lo global.lo hash.lo \
184185
icu.lo insert.lo journal.lo legacy.lo loadext.lo \
@@ -329,6 +330,7 @@ SRC += \
329330
$(TOP)/ext/fts3/fts3_tokenizer.h \
330331
$(TOP)/ext/fts3/fts3_tokenizer.c \
331332
$(TOP)/ext/fts3/fts3_tokenizer1.c \
333+
$(TOP)/ext/fts3/fts3_tokenize_vtab.c \
332334
$(TOP)/ext/fts3/fts3_unicode.c \
333335
$(TOP)/ext/fts3/fts3_unicode2.c \
334336
$(TOP)/ext/fts3/fts3_write.c
@@ -370,8 +372,8 @@ TESTSRC = \
370372
$(TOP)/src/test_config.c \
371373
$(TOP)/src/test_demovfs.c \
372374
$(TOP)/src/test_devsym.c \
375+
$(TOP)/src/test_fs.c \
373376
$(TOP)/src/test_func.c \
374-
$(TOP)/src/test_fuzzer.c \
375377
$(TOP)/src/test_hexio.c \
376378
$(TOP)/src/test_init.c \
377379
$(TOP)/src/test_intarray.c \
@@ -392,11 +394,22 @@ TESTSRC = \
392394
$(TOP)/src/test_tclvar.c \
393395
$(TOP)/src/test_thread.c \
394396
$(TOP)/src/test_vfs.c \
395-
$(TOP)/src/test_wholenumber.c \
396397
$(TOP)/src/test_wsd.c \
397398
$(TOP)/ext/fts3/fts3_term.c \
398399
$(TOP)/ext/fts3/fts3_test.c
399400

401+
# Statically linked extensions
402+
#
403+
TESTSRC += \
404+
$(TOP)/ext/misc/amatch.c \
405+
$(TOP)/ext/misc/closure.c \
406+
$(TOP)/ext/misc/fuzzer.c \
407+
$(TOP)/ext/misc/ieee754.c \
408+
$(TOP)/ext/misc/nextchar.c \
409+
$(TOP)/ext/misc/regexp.c \
410+
$(TOP)/ext/misc/spellfix.c \
411+
$(TOP)/ext/misc/wholenumber.c
412+
400413
# Source code to the library files needed by the test fixture
401414
#
402415
TESTSRC2 = \
@@ -411,6 +424,7 @@ TESTSRC2 = \
411424
$(TOP)/src/func.c \
412425
$(TOP)/src/insert.c \
413426
$(TOP)/src/wal.c \
427+
$(TOP)/src/main.c \
414428
$(TOP)/src/mem5.c \
415429
$(TOP)/src/os.c \
416430
$(TOP)/src/os_unix.c \
@@ -513,6 +527,11 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
513527
-o $@ $(TOP)/src/shell.c libsqlite3.la \
514528
$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
515529

530+
mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c
531+
$(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
532+
$(TLIBS) -rpath "$(libdir)"
533+
534+
516535
# This target creates a directory named "tsrc" and fills it with
517536
# copies of all of the C source code and header files needed to
518537
# build on the target system. Some of the C source code and header
@@ -530,6 +549,7 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
530549

531550
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
532551
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
552+
cp tsrc/shell.c tsrc/sqlite3ext.h .
533553

534554
tclsqlite3.c: sqlite3.c
535555
echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
@@ -870,6 +890,9 @@ fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
870890
fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
871891
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer1.c
872892

893+
fts3_tokenize_vtab.lo: $(TOP)/ext/fts3/fts3_tokenize_vtab.c $(HDR) $(EXTHDR)
894+
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenize_vtab.c
895+
873896
fts3_unicode.lo: $(TOP)/ext/fts3/fts3_unicode.c $(HDR) $(EXTHDR)
874897
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_unicode.c
875898

@@ -896,7 +919,8 @@ TESTFIXTURE_FLAGS += -DBUILD_sqlite
896919

897920
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
898921
TESTFIXTURE_SRC1 = sqlite3.c
899-
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
922+
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
923+
TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
900924

901925
testfixture$(TEXE): $(TESTFIXTURE_SRC)
902926
$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
@@ -962,8 +986,11 @@ clean:
962986
rm -f testfixture$(TEXE) test.db
963987
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
964988
rm -f sqlite3.c
989+
rm -f sqlite3rc.h
990+
rm -f shell.c sqlite3ext.h
965991
rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
966992
rm -f sqlite-*-output.vsix
993+
rm -f mptester mptester.exe
967994

968995
distclean: clean
969996
rm -f config.log config.status libtool Makefile sqlite3.pc

‎Makefile.msc‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
478478
expr.lo fault.lo fkey.lo \
479479
fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
480480
fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
481-
fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
481+
fts3_tokenize_vtab.lo fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
482482
func.lo global.lo hash.lo \
483483
icu.lo insert.lo journal.lo legacy.lo loadext.lo \
484484
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
@@ -638,6 +638,7 @@ SRC = $(SRC) \
638638
$(TOP)\ext\fts3\fts3_tokenizer.h \
639639
$(TOP)\ext\fts3\fts3_tokenizer.c \
640640
$(TOP)\ext\fts3\fts3_tokenizer1.c \
641+
$(TOP)\ext\fts3\fts3_tokenize_vtab.c \
641642
$(TOP)\ext\fts3\fts3_unicode.c \
642643
$(TOP)\ext\fts3\fts3_unicode2.c \
643644
$(TOP)\ext\fts3\fts3_write.c
@@ -678,8 +679,8 @@ TESTSRC = \
678679
$(TOP)\src\test_config.c \
679680
$(TOP)\src\test_demovfs.c \
680681
$(TOP)\src\test_devsym.c \
682+
$(TOP)\src\test_fs.c \
681683
$(TOP)\src\test_func.c \
682-
$(TOP)\src\test_fuzzer.c \
683684
$(TOP)\src\test_hexio.c \
684685
$(TOP)\src\test_init.c \
685686
$(TOP)\src\test_intarray.c \
@@ -700,11 +701,23 @@ TESTSRC = \
700701
$(TOP)\src\test_tclvar.c \
701702
$(TOP)\src\test_thread.c \
702703
$(TOP)\src\test_vfs.c \
703-
$(TOP)\src\test_wholenumber.c \
704704
$(TOP)\src\test_wsd.c \
705705
$(TOP)\ext\fts3\fts3_term.c \
706706
$(TOP)\ext\fts3\fts3_test.c
707707

708+
# Statically linked extensions
709+
#
710+
TESTEXT = \
711+
$(TOP)\ext\misc\amatch.c \
712+
$(TOP)\ext\misc\closure.c \
713+
$(TOP)\ext\misc\fuzzer.c \
714+
$(TOP)\ext\misc\ieee754.c \
715+
$(TOP)\ext\misc\nextchar.c \
716+
$(TOP)\ext\misc\regexp.c \
717+
$(TOP)\ext\misc\spellfix.c \
718+
$(TOP)\ext\misc\wholenumber.c
719+
720+
708721
# Source code to the library files needed by the test fixture
709722
#
710723
TESTSRC2 = \
@@ -719,6 +732,7 @@ TESTSRC2 = \
719732
$(TOP)\src\func.c \
720733
$(TOP)\src\insert.c \
721734
$(TOP)\src\wal.c \
735+
$(TOP)\src\main.c \
722736
$(TOP)\src\mem5.c \
723737
$(TOP)\src\os.c \
724738
$(TOP)\src\os_unix.c \
@@ -746,6 +760,7 @@ TESTSRC2 = \
746760
$(TOP)\ext\fts3\fts3_aux.c \
747761
$(TOP)\ext\fts3\fts3_expr.c \
748762
$(TOP)\ext\fts3\fts3_tokenizer.c \
763+
$(TOP)\ext\fts3\fts3_tokenize_vtab.c \
749764
$(TOP)\ext\fts3\fts3_unicode.c \
750765
$(TOP)\ext\fts3\fts3_unicode2.c \
751766
$(TOP)\ext\fts3\fts3_write.c \
@@ -811,6 +826,10 @@ sqlite3.exe: $(TOP)\src\shell.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
811826
$(TOP)\src\shell.c \
812827
/link $(LTLINKOPTS) $(LTLIBPATHS) libsqlite3.lib $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
813828

829+
mptester.exe: $(TOP)\mptest\mptest.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
830+
$(LTLINK) $(TOP)\mptest\mptest.c \
831+
/link $(LTLINKOPTS) $(LTLIBPATHS) libsqlite3.lib $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
832+
814833
# This target creates a directory named "tsrc" and fills it with
815834
# copies of all of the C source code and header files needed to
816835
# build on the target system. Some of the C source code and header
@@ -828,6 +847,8 @@ sqlite3.exe: $(TOP)\src\shell.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
828847

829848
sqlite3.c: .target_source $(TOP)\tool\mksqlite3c.tcl
830849
$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
850+
copy tsrc\shell.c .
851+
copy tsrc\sqlite3ext.h .
831852

832853
sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
833854
$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -1168,6 +1189,9 @@ fts3_tokenizer.lo: $(TOP)\ext\fts3\fts3_tokenizer.c $(HDR) $(EXTHDR)
11681189
fts3_tokenizer1.lo: $(TOP)\ext\fts3\fts3_tokenizer1.c $(HDR) $(EXTHDR)
11691190
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer1.c
11701191

1192+
fts3_tokenize_vtab.lo: $(TOP)\ext\fts3\fts3_tokenize_vtab.c $(HDR) $(EXTHDR)
1193+
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenize_vtab.c
1194+
11711195
fts3_unicode.lo: $(TOP)\ext\fts3\fts3_unicode.c $(HDR) $(EXTHDR)
11721196
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode.c
11731197

@@ -1191,8 +1215,8 @@ rtree.lo: $(TOP)\ext\rtree\rtree.c $(HDR) $(EXTHDR)
11911215
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
11921216
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
11931217

1194-
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.lib
1195-
TESTFIXTURE_SRC1 = sqlite3.c
1218+
TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) libsqlite3.lib
1219+
TESTFIXTURE_SRC1 = $(TESTEXT) sqlite3.c
11961220
!IF $(USE_AMALGAMATION)==0
11971221
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
11981222
!ELSE
@@ -1246,8 +1270,10 @@ clean:
12461270
del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
12471271
del /Q sqlite3.c
12481272
del /Q sqlite3rc.h
1273+
del /Q shell.c sqlite3ext.h
12491274
del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp sqlite3_analyzer.c
12501275
del /Q sqlite-*-output.vsix
1276+
del /Q mptester.exe
12511277

12521278
# Dynamic link library section.
12531279
#

‎Makefile.vxworks‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,4 +662,6 @@ clean:
662662
rm -rf tsrc target_source
663663
rm -f testloadext.dll libtestloadext.so
664664
rm -f sqlite3.c fts?amal.c tclsqlite3.c
665+
rm -f sqlite3rc.h
666+
rm -f shell.c sqlite3ext.h
665667
rm -f $(SHPREFIX)sqlite3.$(SO)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.15.2
1+
3.7.17

0 commit comments

Comments
 (0)