diff options
| author | drh <drh@noemail.net> | 2012-05-28 18:22:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-05-28 18:22:41 +0000 |
| commit | 14bcd7d25e0902912d2eecef4839934e22f1b9db (patch) | |
| tree | 5e011a6c08fa26cdd4388ce8713f04385ffb26d9 /ext/fts3/fts3.c | |
| parent | e56467fc9ffdf634b939c33886e6513fc27376c3 (diff) | |
| parent | 9cb7200815baf934dff0db605a38ff675bcef40e (diff) | |
| download | sqlite-14bcd7d25e0902912d2eecef4839934e22f1b9db.tar.gz sqlite-14bcd7d25e0902912d2eecef4839934e22f1b9db.zip | |
Merge the unicode61 tokenizer and the shared-cache-memory database changes
into the sessions branch.
FossilOrigin-Name: df817e70afc3f41e680d8f84dfa5772d5b3ae4d9
Diffstat (limited to 'ext/fts3/fts3.c')
| -rw-r--r-- | ext/fts3/fts3.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index f80e303b5..3531cb4df 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -3554,6 +3554,9 @@ static void hashDestroy(void *p){ */ void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule); void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule); +#ifndef SQLITE_DISABLE_FTS3_UNICODE +void sqlite3Fts3UnicodeTokenizer(sqlite3_tokenizer_module const**ppModule); +#endif #ifdef SQLITE_ENABLE_ICU void sqlite3Fts3IcuTokenizerModule(sqlite3_tokenizer_module const**ppModule); #endif @@ -3569,12 +3572,19 @@ int sqlite3Fts3Init(sqlite3 *db){ Fts3Hash *pHash = 0; const sqlite3_tokenizer_module *pSimple = 0; const sqlite3_tokenizer_module *pPorter = 0; +#ifndef SQLITE_DISABLE_FTS3_UNICODE + const sqlite3_tokenizer_module *pUnicode = 0; +#endif #ifdef SQLITE_ENABLE_ICU const sqlite3_tokenizer_module *pIcu = 0; sqlite3Fts3IcuTokenizerModule(&pIcu); #endif +#ifndef SQLITE_DISABLE_FTS3_UNICODE + sqlite3Fts3UnicodeTokenizer(&pUnicode); +#endif + #ifdef SQLITE_TEST rc = sqlite3Fts3InitTerm(db); if( rc!=SQLITE_OK ) return rc; @@ -3598,6 +3608,10 @@ int sqlite3Fts3Init(sqlite3 *db){ if( rc==SQLITE_OK ){ if( sqlite3Fts3HashInsert(pHash, "simple", 7, (void *)pSimple) || sqlite3Fts3HashInsert(pHash, "porter", 7, (void *)pPorter) + +#ifndef SQLITE_DISABLE_FTS3_UNICODE + || sqlite3Fts3HashInsert(pHash, "unicode61", 10, (void *)pUnicode) +#endif #ifdef SQLITE_ENABLE_ICU || (pIcu && sqlite3Fts3HashInsert(pHash, "icu", 4, (void *)pIcu)) #endif |