Skip to content

Commit 9e81348

Browse files
Update SQLite to 3.15.0
1 parent c3c437f commit 9e81348

File tree

131 files changed

+7510
-1867
lines changed

Some content is hidden

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

131 files changed

+7510
-1867
lines changed

README.md

Lines changed: 5 additions & 5 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-
**September 29, 2016: Update SQLite to 3.14.2**, fix for building on macOS Sierra ([changelog](CHANGELOG.md)).
11+
**October 14, 2016: Update SQLite to 3.15.0** ([changelog](CHANGELOG.md)).
1212

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

15-
**SQLite Included:** 3.14.2
15+
**SQLite Included:** 3.15.0
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.14.2.
68+
SQLiteLib currently ships with the source for SQLite 3.15.0.
6969

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

@@ -127,7 +127,7 @@ The built-in OSX/iOS version of SQLite were built with the following compilation
127127

128128
SQLiteLib uses these settings with one exception - on iOS:
129129

130-
The SQLite code (verified in: 3.14.2) uses a deprecated function (`gethostuuid()`).
130+
The SQLite code (verified in: 3.15.0) uses a deprecated function (`gethostuuid()`).
131131

132132
D. Richard Hipp (SQLite architect), suggests working around this on iOS using `-DSQLITE_ENABLE_LOCKING_STYLE=0`:
133133
> "The SQLITE_ENABLE_LOCKING_STYLE thing is an apple-only extension that
@@ -140,7 +140,7 @@ D. Richard Hipp (SQLite architect), suggests working around this on iOS using `-
140140
Thus, SQLiteLib uses `SQLITE_ENABLE_LOCKING_STYLE=1` on OSX,
141141
**but on iOS, SQLiteLib compiles with `ENABLE_LOCKING_STYLE=0`**.
142142

143-
This removes the code that uses the deprecated function, but doesn't get rid of the warning that "`gethostuuid() is disabled`" (as of 3.14.2).
143+
This removes the code that uses the deprecated function, but doesn't get rid of the warning that "`gethostuuid() is disabled`" (as of 3.15.0).
144144

145145
To prevent this warning, SQLiteLib separately specifies `-Wno-#warnings` when building for iOS.
146146

sqlite/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ TESTSRC = \
382382
$(TOP)/src/test_blob.c \
383383
$(TOP)/src/test_btree.c \
384384
$(TOP)/src/test_config.c \
385+
$(TOP)/src/test_delete.c \
385386
$(TOP)/src/test_demovfs.c \
386387
$(TOP)/src/test_devsym.c \
387388
$(TOP)/src/test_fs.c \

sqlite/Makefile.msc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,6 +1348,7 @@ TESTSRC = \
13481348
$(TOP)\src\test_blob.c \
13491349
$(TOP)\src\test_btree.c \
13501350
$(TOP)\src\test_config.c \
1351+
$(TOP)\src\test_delete.c \
13511352
$(TOP)\src\test_demovfs.c \
13521353
$(TOP)\src\test_devsym.c \
13531354
$(TOP)\src\test_fs.c \

sqlite/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.14.2
1+
3.15.0

sqlite/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.14.2.
3+
# Generated by GNU Autoconf 2.69 for sqlite 3.15.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.14.2'
730-
PACKAGE_STRING='sqlite 3.14.2'
729+
PACKAGE_VERSION='3.15.0'
730+
PACKAGE_STRING='sqlite 3.15.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.14.2 to adapt to many kinds of systems.
1466+
\`configure' configures sqlite 3.15.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.14.2:";;
1531+
short | recursive ) echo "Configuration of sqlite 3.15.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.14.2
1655+
sqlite configure 3.15.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.14.2, which was
2074+
It was created by sqlite $as_me 3.15.0, which was
20752075
generated by GNU Autoconf 2.69. Invocation command line was
20762076
20772077
$ $0 $@
@@ -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.14.2, which was
12154+
This file was extended by sqlite $as_me 3.15.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.14.2
12220+
sqlite config.status 3.15.0
1222112221
configured by $0, generated by GNU Autoconf 2.69,
1222212222
with options \\"\$ac_cs_config\\"
1222312223

sqlite/doc/lemon.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h3>Command Line Options</h3>
8585
Do not generate a parser. Instead write the input grammar to standard
8686
output with all comments, actions, and other extraneous text removed.
8787
<li><b>-l</b>
88-
Omit "#line" directives int the generated parser C code.
88+
Omit "#line" directives in the generated parser C code.
8989
<li><b>-m</b>
9090
Cause the output C source code to be compatible with the "makeheaders"
9191
program.
@@ -929,7 +929,7 @@ <h4>The <tt>%token_type</tt> and <tt>%type</tt> directives</h4>
929929
</pre></p>
930930

931931
<p>If the data type of terminals is not specified, the default value
932-
is "int".</p>
932+
is "void*".</p>
933933

934934
<p>Non-terminal symbols can each have their own data types. Typically
935935
the data type of a non-terminal is a pointer to the root of a parse-tree

sqlite/ext/fts5/fts5Int.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ void sqlite3Fts5ParseNodeFree(Fts5ExprNode*);
737737

738738
void sqlite3Fts5ParseSetDistance(Fts5Parse*, Fts5ExprNearset*, Fts5Token*);
739739
void sqlite3Fts5ParseSetColset(Fts5Parse*, Fts5ExprNearset*, Fts5Colset*);
740+
Fts5Colset *sqlite3Fts5ParseColsetInvert(Fts5Parse*, Fts5Colset*);
740741
void sqlite3Fts5ParseFinished(Fts5Parse *pParse, Fts5ExprNode *p);
741742
void sqlite3Fts5ParseNear(Fts5Parse *pParse, Fts5Token*);
742743

0 commit comments

Comments
 (0)