diff options
| author | drh <drh@noemail.net> | 2015-10-08 19:29:18 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-10-08 19:29:18 +0000 |
| commit | 50065656f7d038d8b1796edb83ecaa5347da5a1d (patch) | |
| tree | d2909fb64acc6a0187d2c4b4941b92222c125cb6 /src | |
| parent | d7fd6aa4ba568e33e9879f94a8542fba0d7be828 (diff) | |
| download | sqlite-50065656f7d038d8b1796edb83ecaa5347da5a1d.tar.gz sqlite-50065656f7d038d8b1796edb83ecaa5347da5a1d.zip | |
First attempt to add json1 and fts5 to the amalgamation. This check-in does
not compile.
FossilOrigin-Name: d820a1bd1b8dd702d1b3a099af393530cc5a5d51
Diffstat (limited to 'src')
| -rw-r--r-- | src/ctime.c | 6 | ||||
| -rw-r--r-- | src/main.c | 9 | ||||
| -rw-r--r-- | src/shell.c | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/src/ctime.c b/src/ctime.c index 9503214f5..17dd710bc 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -96,12 +96,18 @@ static const char * const azCompileOpt[] = { #if SQLITE_ENABLE_FTS4 "ENABLE_FTS4", #endif +#if SQLITE_ENABLE_FTS5 + "ENABLE_FTS5", +#endif #if SQLITE_ENABLE_ICU "ENABLE_ICU", #endif #if SQLITE_ENABLE_IOTRACE "ENABLE_IOTRACE", #endif +#if SQLITE_ENABLE_JSON1 + "ENABLE_JSON1", +#endif #if SQLITE_ENABLE_LOAD_EXTENSION "ENABLE_LOAD_EXTENSION", #endif diff --git a/src/main.c b/src/main.c index fa374c701..43d2efcfe 100644 --- a/src/main.c +++ b/src/main.c @@ -2872,12 +2872,19 @@ 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 ){ + extern int sqlite3Fts5Init(sqlite3*); + rc = sqlite3Fts5Init(db); + } +#endif + #ifdef SQLITE_ENABLE_ICU if( !db->mallocFailed && rc==SQLITE_OK ){ rc = sqlite3IcuInit(db); diff --git a/src/shell.c b/src/shell.c index 96d0ab65f..f79087122 100644 --- a/src/shell.c +++ b/src/shell.c @@ -4654,13 +4654,6 @@ int SQLITE_CDECL main(int argc, char **argv){ } data.out = stdout; -#ifdef SQLITE_SHELL_JSON1 - { - extern int sqlite3_json_init(sqlite3*); - sqlite3_auto_extension((void(*)(void))sqlite3_json_init); - } -#endif - /* Go ahead and open the database file if it already exists. If the ** file does not exist, delay opening it. This prevents empty database ** files from being created if a user mistypes the database name argument |