diff options
| author | drh <drh@noemail.net> | 2015-10-09 15:29:24 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-10-09 15:29:24 +0000 |
| commit | 973bc6f1a8d57992248eef0355671bf036d87042 (patch) | |
| tree | a1935cd8fb2ebf10960b4ecaae93901e33f68455 /src/main.c | |
| parent | 2d000eafbe22869fd9c25a01d2f7de7232ea67e5 (diff) | |
| parent | 2572751be87022f7dcfdfbae8d874e68a1382b66 (diff) | |
| download | sqlite-973bc6f1a8d57992248eef0355671bf036d87042.tar.gz sqlite-973bc6f1a8d57992248eef0355671bf036d87042.zip | |
Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5
into the amalgamation from trunk.
FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 2aca573b0..f41ea3b65 100644 --- a/src/main.c +++ b/src/main.c @@ -25,6 +25,12 @@ #ifdef SQLITE_ENABLE_ICU # include "sqliteicu.h" #endif +#ifdef SQLITE_ENABLE_JSON1 +int sqlite3Json1Init(sqlite3*); +#endif +#ifdef SQLITE_ENABLE_FTS5 +int sqlite3Fts5Init(sqlite3*); +#endif #ifndef SQLITE_AMALGAMATION /* IMPLEMENTATION-OF: R-46656-45156 The sqlite3_version[] string constant @@ -2893,12 +2899,18 @@ static int openDatabase( } #endif -#ifdef SQLITE_ENABLE_FTS3 +#ifdef SQLITE_ENABLE_FTS3 /* automatically defined by SQLITE_ENABLE_FTS4 */ if( !db->mallocFailed && rc==SQLITE_OK ){ rc = sqlite3Fts3Init(db); } #endif +#ifdef SQLITE_ENABLE_FTS5 + if( !db->mallocFailed && rc==SQLITE_OK ){ + rc = sqlite3Fts5Init(db); + } +#endif + #ifdef SQLITE_ENABLE_ICU if( !db->mallocFailed && rc==SQLITE_OK ){ rc = sqlite3IcuInit(db); @@ -2919,7 +2931,6 @@ static int openDatabase( #ifdef SQLITE_ENABLE_JSON1 if( !db->mallocFailed && rc==SQLITE_OK){ - extern int sqlite3Json1Init(sqlite3*); rc = sqlite3Json1Init(db); } #endif |