Skip to content

Commit 59f3619

Browse files
swiftlyfallingswiftlyfalling
authored
Update SQLite to 3.19.0
1 parent ac36fff commit 59f3619

Some content is hidden

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

105 files changed

+3761
-1294
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ If you need a specific version of SQLite, or specific SQLite compilation options
88

99

1010

11-
**April 1, 2017: Update SQLite to 3.18.0** ([changelog](CHANGELOG.md)).
11+
**May 23, 2017: Update SQLite to 3.19.0** ([changelog](CHANGELOG.md)).
1212

1313
**Requirements**: iOS 8.0+ / OSX 10.9+, Xcode 7.3+
1414

15-
**SQLite Included:** **[3.18.0](https://www.sqlite.org/releaselog/3_18_0.html)**
15+
**SQLite Included:** **[3.19.0](https://www.sqlite.org/releaselog/3_19_0.html)**
1616

1717

1818

@@ -65,7 +65,7 @@ There is no need to modify any other files.
6565

6666
#### Compiling a Specific Version of SQLite:
6767

68-
SQLiteLib currently ships with the source for SQLite 3.18.0.
68+
SQLiteLib currently ships with the source for SQLite 3.19.0.
6969

7070
If you'd like to compile a newer (or older) version, the process is simple:
7171

‎sqlite/Makefile.msc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ 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
2525
!ENDIF
2626

2727
# Set this non-0 to enable treating warnings as errors (-WX, etc) when
@@ -745,8 +745,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
745745

746746
!IF $(DEBUG)>2
747747
TCC = $(TCC) -DSQLITE_DEBUG=1
748-
TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
749748
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
750753
!ENDIF
751754

752755
!IF $(DEBUG)>4 || $(OSTRACE)!=0
@@ -1559,7 +1562,7 @@ $(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
15591562
sqlite3.def: libsqlite3.lib
15601563
echo EXPORTS > sqlite3.def
15611564
dumpbin /all libsqlite3.lib \
1562-
| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3(?:session|changeset)?_[^@]*)(?:@\d+)?$$" \1 \
1565+
| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3(?:session|changeset|changegroup)?_[^@]*)(?:@\d+)?$$" \1 \
15631566
| sort >> sqlite3.def
15641567
# <</block2>>
15651568

‎sqlite/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.18.0
1+
3.19.0

‎sqlite/autoconf/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
1212
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
1313
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
1414

15-
include_HEADERS = sqlite3.h sqlite3ext.h
15+
include_HEADERS = sqlite3.h sqlite3ext.h msvc.h
1616

1717
EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
1818
pkgconfigdir = ${libdir}/pkgconfig

‎sqlite/autoconf/Makefile.msc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TOP = .
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
2525
!ENDIF
2626

2727
# Set this non-0 to enable treating warnings as errors (-WX, etc) when
@@ -644,8 +644,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
644644

645645
!IF $(DEBUG)>2
646646
TCC = $(TCC) -DSQLITE_DEBUG=1
647-
TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
648647
RCC = $(RCC) -DSQLITE_DEBUG=1
648+
!IF $(DYNAMIC_SHELL)==0
649+
TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
650+
RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
651+
!ENDIF
649652
!ENDIF
650653

651654
!IF $(DEBUG)>4 || $(OSTRACE)!=0
@@ -951,7 +954,7 @@ Replace.exe:
951954
sqlite3.def: Replace.exe $(LIBOBJ)
952955
echo EXPORTS > sqlite3.def
953956
dumpbin /all $(LIBOBJ) \
954-
| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
957+
| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
955958
| sort >> sqlite3.def
956959

957960
$(SQLITE3EXE): $(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)

‎sqlite/configure‎

Lines changed: 19 additions & 19 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.18.0.
3+
# Generated by GNU Autoconf 2.69 for sqlite 3.19.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.18.0'
730-
PACKAGE_STRING='sqlite 3.18.0'
729+
PACKAGE_VERSION='3.19.0'
730+
PACKAGE_STRING='sqlite 3.19.0'
731731
PACKAGE_BUGREPORT=''
732732
PACKAGE_URL=''
733733

@@ -1463,7 +1463,7 @@ if test "$ac_init_help" = "long"; then
14631463
# Omit some internal or obsolete options to make the list less imposing.
14641464
# This message is too long to be a string in the A/UX 3.1 sh.
14651465
cat <<_ACEOF
1466-
\`configure' configures sqlite 3.18.0 to adapt to many kinds of systems.
1466+
\`configure' configures sqlite 3.19.0 to adapt to many kinds of systems.
14671467
14681468
Usage: $0 [OPTION]... [VAR=VALUE]...
14691469
@@ -1528,7 +1528,7 @@ fi
15281528

15291529
if test -n "$ac_init_help"; then
15301530
case $ac_init_help in
1531-
short | recursive ) echo "Configuration of sqlite 3.18.0:";;
1531+
short | recursive ) echo "Configuration of sqlite 3.19.0:";;
15321532
esac
15331533
cat <<\_ACEOF
15341534
@@ -1652,7 +1652,7 @@ fi
16521652
test -n "$ac_init_help" && exit $ac_status
16531653
if $ac_init_version; then
16541654
cat <<\_ACEOF
1655-
sqlite configure 3.18.0
1655+
sqlite configure 3.19.0
16561656
generated by GNU Autoconf 2.69
16571657
16581658
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2071,7 +2071,7 @@ cat >config.log <<_ACEOF
20712071
This file contains any messages produced by compilers while
20722072
running configure, to aid debugging if configure makes a mistake.
20732073
2074-
It was created by sqlite $as_me 3.18.0, which was
2074+
It was created by sqlite $as_me 3.19.0, which was
20752075
generated by GNU Autoconf 2.69. Invocation command line was
20762076
20772077
$ $0 $@
@@ -11252,7 +11252,7 @@ else
1125211252
fi
1125311253

1125411254
if test "${use_debug}" = "yes" ; then
11255-
TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE"
11255+
TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0"
1125611256
else
1125711257
TARGET_DEBUG="-DNDEBUG"
1125811258
fi
@@ -11356,7 +11356,7 @@ fi
1135611356
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
1135711357
$as_echo_n "checking whether to support MEMSYS5... " >&6; }
1135811358
if test "${enable_memsys5}" = "yes"; then
11359-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5"
11359+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
1136011360
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1136111361
$as_echo "yes" >&6; }
1136211362
else
@@ -11373,7 +11373,7 @@ fi
1137311373
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
1137411374
$as_echo_n "checking whether to support MEMSYS3... " >&6; }
1137511375
if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
11376-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
11376+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
1137711377
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1137811378
$as_echo "yes" >&6; }
1137911379
else
@@ -11391,7 +11391,7 @@ else
1139111391
fi
1139211392

1139311393
if test "${enable_fts3}" = "yes" ; then
11394-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS3"
11394+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
1139511395
fi
1139611396
# Check whether --enable-fts4 was given.
1139711397
if test "${enable_fts4+set}" = set; then :
@@ -11401,7 +11401,7 @@ else
1140111401
fi
1140211402

1140311403
if test "${enable_fts4}" = "yes" ; then
11404-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS4"
11404+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
1140511405
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
1140611406
$as_echo_n "checking for library containing log... " >&6; }
1140711407
if ${ac_cv_search_log+:} false; then :
@@ -11467,7 +11467,7 @@ else
1146711467
fi
1146811468

1146911469
if test "${enable_fts5}" = "yes" ; then
11470-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS5"
11470+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
1147111471
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
1147211472
$as_echo_n "checking for library containing log... " >&6; }
1147311473
if ${ac_cv_search_log+:} false; then :
@@ -11536,7 +11536,7 @@ else
1153611536
fi
1153711537

1153811538
if test "${enable_json1}" = "yes" ; then
11539-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_JSON1"
11539+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
1154011540
fi
1154111541

1154211542
#########
@@ -11549,7 +11549,7 @@ else
1154911549
fi
1155011550

1155111551
if test "${enable_rtree}" = "yes" ; then
11552-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_RTREE"
11552+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
1155311553
fi
1155411554

1155511555
#########
@@ -11562,8 +11562,8 @@ else
1156211562
fi
1156311563

1156411564
if test "${enable_session}" = "yes" ; then
11565-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_SESSION"
11566-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_PREUPDATE_HOOK"
11565+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
11566+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
1156711567
fi
1156811568

1156911569
#########
@@ -12151,7 +12151,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1215112151
# report actual input values of CONFIG_FILES etc. instead of their
1215212152
# values after options handling.
1215312153
ac_log="
12154-
This file was extended by sqlite $as_me 3.18.0, which was
12154+
This file was extended by sqlite $as_me 3.19.0, which was
1215512155
generated by GNU Autoconf 2.69. Invocation command line was
1215612156
1215712157
CONFIG_FILES = $CONFIG_FILES
@@ -12217,7 +12217,7 @@ _ACEOF
1221712217
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1221812218
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1221912219
ac_cs_version="\\
12220-
sqlite config.status 3.18.0
12220+
sqlite config.status 3.19.0
1222112221
configured by $0, generated by GNU Autoconf 2.69,
1222212222
with options \\"\$ac_cs_config\\"
1222312223

‎sqlite/configure.ac‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ AC_SEARCH_LIBS(fdatasync, [rt])
560560
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]),
561561
[use_debug=$enableval],[use_debug=no])
562562
if test "${use_debug}" = "yes" ; then
563-
TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE"
563+
TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0"
564564
else
565565
TARGET_DEBUG="-DNDEBUG"
566566
fi
@@ -596,7 +596,7 @@ AC_ARG_ENABLE(memsys5,
596596
[enable_memsys5=yes],[enable_memsys5=no])
597597
AC_MSG_CHECKING([whether to support MEMSYS5])
598598
if test "${enable_memsys5}" = "yes"; then
599-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5"
599+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
600600
AC_MSG_RESULT([yes])
601601
else
602602
AC_MSG_RESULT([no])
@@ -606,7 +606,7 @@ AC_ARG_ENABLE(memsys3,
606606
[enable_memsys3=yes],[enable_memsys3=no])
607607
AC_MSG_CHECKING([whether to support MEMSYS3])
608608
if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
609-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
609+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
610610
AC_MSG_RESULT([yes])
611611
else
612612
AC_MSG_RESULT([no])
@@ -618,20 +618,20 @@ AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3],
618618
[Enable the FTS3 extension]),
619619
[enable_fts3=yes],[enable_fts3=no])
620620
if test "${enable_fts3}" = "yes" ; then
621-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS3"
621+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
622622
fi
623623
AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4],
624624
[Enable the FTS4 extension]),
625625
[enable_fts4=yes],[enable_fts4=no])
626626
if test "${enable_fts4}" = "yes" ; then
627-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS4"
627+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
628628
AC_SEARCH_LIBS([log],[m])
629629
fi
630630
AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5],
631631
[Enable the FTS5 extension]),
632632
[enable_fts5=yes],[enable_fts5=no])
633633
if test "${enable_fts5}" = "yes" ; then
634-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS5"
634+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
635635
AC_SEARCH_LIBS([log],[m])
636636
fi
637637

@@ -641,7 +641,7 @@ AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],
641641
[Enable the JSON1 extension]),
642642
[enable_json1=yes],[enable_json1=no])
643643
if test "${enable_json1}" = "yes" ; then
644-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_JSON1"
644+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
645645
fi
646646

647647
#########
@@ -650,7 +650,7 @@ AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree],
650650
[Enable the RTREE extension]),
651651
[enable_rtree=yes],[enable_rtree=no])
652652
if test "${enable_rtree}" = "yes" ; then
653-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_RTREE"
653+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
654654
fi
655655

656656
#########
@@ -659,8 +659,8 @@ AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
659659
[Enable the SESSION extension]),
660660
[enable_session=yes],[enable_session=no])
661661
if test "${enable_session}" = "yes" ; then
662-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_SESSION"
663-
OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_PREUPDATE_HOOK"
662+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
663+
OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
664664
fi
665665

666666
#########

0 commit comments

Comments
 (0)