Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Some tests for the new FTS stuff.

This commit is contained in:
John Maguire 2010-06-20 20:44:54 +00:00
parent 59984c49ad
commit f989976d30
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/database.cpp
View File

@ -91,26 +91,6 @@ bool Database::sLoadedSqliteSymbols = false;
sqlite3_tokenizer_module* Database::sFTSTokenizer = NULL;
struct Token {
QString token;
int start_offset;
int end_offset;
};
extern "C" {
// Based on sqlite3_tokenizer.
struct UnicodeTokenizer {
const sqlite3_tokenizer_module* pModule;
};
struct UnicodeTokenizerCursor {
const sqlite3_tokenizer* pTokenizer;
QList<Token> tokens;
int position;
QByteArray current_utf8;
};
}
int Database::FTSCreate(int argc, const char* const* argv, sqlite3_tokenizer** tokenizer) {
*tokenizer = reinterpret_cast<sqlite3_tokenizer*>(new UnicodeTokenizer);
@ -120,7 +100,6 @@ int Database::FTSCreate(int argc, const char* const* argv, sqlite3_tokenizer** t
int Database::FTSDestroy(sqlite3_tokenizer* tokenizer) {
UnicodeTokenizer* real_tokenizer = reinterpret_cast<UnicodeTokenizer*>(tokenizer);
qDebug() << __PRETTY_FUNCTION__;
delete real_tokenizer;
return SQLITE_OK;
}
@ -432,9 +411,9 @@ QSqlDatabase Database::Connect() {
if (rc == SQLITE_OK) {
_sqlite3_bind_text(statement, 1, "unicode", -1, SQLITE_STATIC);
_sqlite3_bind_blob(statement, 2, &sFTSTokenizer, sizeof(sFTSTokenizer), SQLITE_STATIC);
qDebug() << _sqlite3_step(statement);
_sqlite3_step(statement);
qDebug() << _sqlite3_finalize(statement);
_sqlite3_finalize(statement);
}
}
}
@ -482,7 +461,6 @@ void Database::UpdateDatabaseSchema(int version, QSqlDatabase &db) {
QStringList commands(schema.split(";\n\n"));
db.transaction();
foreach (const QString& command, commands) {
qDebug() << command;
QSqlQuery query(db.exec(command));
if (CheckErrors(query.lastError()))
qFatal("Unable to update music library database");

20
src/core/database.h
View File

@ -74,6 +74,8 @@ class Database : public QObject {
FRIEND_TEST(DatabaseTest, LikeCacheInvalidated);
FRIEND_TEST(DatabaseTest, LikeQuerySplit);
FRIEND_TEST(DatabaseTest, LikeDecomposes);
FRIEND_TEST(DatabaseTest, FTSOpenParsesSimpleInput);
FRIEND_TEST(DatabaseTest, FTSOpenParsesUTF8Input);
// Do static initialisation like loading sqlite functions.
static void StaticInit();
@ -120,6 +122,24 @@ class Database : public QObject {
int* start_offset,
int* end_offset,
int* position);
struct Token {
QString token;
int start_offset;
int end_offset;
};
// Based on sqlite3_tokenizer.
struct UnicodeTokenizer {
const sqlite3_tokenizer_module* pModule;
};
struct UnicodeTokenizerCursor {
const sqlite3_tokenizer* pTokenizer;
QList<Token> tokens;
int position;
QByteArray current_utf8;
};
};
class MemoryDatabase : public Database {