database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Json1 tests are working. Builds without FTS5 enabled. Still some problems

Browse Source 
building with FTS5.

FossilOrigin-Name: 2928f8e87d2e5d121e6e7e5993cbb773bb2b0603
This commit is contained in:
drh
2015-10-08 23:37:00 +00:00
parent d3b90a2e41
commit c306e08ad5
10 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@@ -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
@@ -2638,13 +2644,6 @@ int sqlite3ParseUri(
return rc;
}
#ifdef SQLITE_ENABLE_FTS5
#ifdef SQLITE_AMALGAMATION
static int sqlite3Fts5Init(sqlite3*);
#else
extern int sqlite3Fts5Init(sqlite3*);
#endif
#endif
/*
** This routine does the work of opening a database on behalf of
@@ -2911,7 +2910,6 @@ static int openDatabase(
#ifdef SQLITE_ENABLE_JSON1
if( !db->mallocFailed && rc==SQLITE_OK){
extern int sqlite3Json1Init(sqlite3*);
rc = sqlite3Json1Init(db);
}
#endif