1
0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-16 11:19:18 +01:00

Register the FTS3 tokenizer with a QSqlQuery, so it works even if we couldn't resolve the sqlite symbols.

This commit is contained in:
David Sansome 2010-06-21 12:38:24 +00:00
parent c950e79367
commit ea52bbf3e2

View File

@ -394,6 +394,14 @@ QSqlDatabase Database::Connect() {
// Find Sqlite3 functions in the Qt plugin. // Find Sqlite3 functions in the Qt plugin.
StaticInit(); StaticInit();
QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
set_fts_tokenizer.bindValue(":name", "unicode");
set_fts_tokenizer.bindValue(":pointer", QByteArray(
reinterpret_cast<const char*>(&sFTSTokenizer), sizeof(sFTSTokenizer)));
if (!set_fts_tokenizer.exec()) {
qWarning() << "Couldn't register FTS3 tokenizer";
}
// We want Unicode aware LIKE clauses and FTS if possible. // We want Unicode aware LIKE clauses and FTS if possible.
if (sLoadedSqliteSymbols) { if (sLoadedSqliteSymbols) {
QVariant v = db.driver()->handle(); QVariant v = db.driver()->handle();
@ -408,17 +416,6 @@ QSqlDatabase Database::Connect() {
this, // Custom data available via sqlite3_user_data(). this, // Custom data available via sqlite3_user_data().
&Database::SqliteLike, // Our function :-) &Database::SqliteLike, // Our function :-)
NULL, NULL); NULL, NULL);
sqlite3_stmt* statement;
const char* sql = "SELECT fts3_tokenizer(?, ?)";
int rc = _sqlite3_prepare_v2(handle, sql, -1, &statement, 0);
if (rc == SQLITE_OK) {
_sqlite3_bind_text(statement, 1, "unicode", -1, SQLITE_STATIC);
_sqlite3_bind_blob(statement, 2, &sFTSTokenizer, sizeof(sFTSTokenizer), SQLITE_STATIC);
_sqlite3_step(statement);
_sqlite3_finalize(statement);
}
} }
} }
} }