crtxcr/looqs
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések 1 Kiadások Wiki Tevékenység

sql: only join content table if necessary

Forráskód böngészése
This commit is contained in:
Albert S. 2018-09-02 12:45:28 +02:00
szülő 4ccc4c27f1
commit d9b01a4941
1 fájl változott, egészen pontosan 14 új sor hozzáadva és 4 régi sor törölve
Statisztikák mutatása Download Patch File Download Diff File Expand all files Collapse all files

16
gui/searchworker.cpp
Fájl megtekintése

@ -131,10 +131,20 @@ void SearchWorker::search(const QString &query)
QSqlQuery dbquery(db); QSqlQuery dbquery(db);
QVector<SearchResult> results; QVector<SearchResult> results;
QString whereSql = makeSql(tokenize(query)); QString whereSql = makeSql(tokenize(query));
QString prep =
"SELECT file.path AS path, content.page AS page, file.mtime AS mtime FROM file INNER JOIN content ON file.id = " QString prep;
"content.fileid INNER JOIN content_fts ON content.id = content_fts.ROWID WHERE 1=1 AND " + // TODO: hack, as we don't wanna look into content and get redundant results, when we don't even care about content
if(whereSql.contains("content."))
{
prep = "SELECT file.path AS path, content.page AS page, file.mtime AS mtime FROM file INNER JOIN content ON "
"file.id = content.fileid INNER JOIN content_fts ON content.id = content_fts.ROWID WHERE 1=1 AND " +
whereSql + " ORDER By file.mtime DESC, content.page ASC"; whereSql + " ORDER By file.mtime DESC, content.page ASC";
}
else
{
prep = "SELECT file.path AS path, 0 as page, file.mtime AS mtime FROM file WHERE " + whereSql +
" ORDER by file.mtime DESC";
}
dbquery.prepare(prep); dbquery.prepare(prep);
dbquery.exec(); dbquery.exec();
qDebug() << "prepped: " << prep; qDebug() << "prepped: " << prep;