crtxcr/looqs
1
0
Fork 0
Código Incidencias Pull Requests 1 Lanzamientos Wiki Actividad

sql: only join content table if necessary

Explorar el Código
Este commit está contenido en:
Albert S. 2018-09-02 12:45:28 +02:00
padre 4ccc4c27f1
commit d9b01a4941
Se han modificado 1 ficheros con 14 adiciones y 4 borrados
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos

18
gui/searchworker.cpp
Ver fichero

@ -131,10 +131,20 @@ void SearchWorker::search(const QString &query)
QSqlQuery dbquery(db);
QVector<SearchResult> results;
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 = "
"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";
QString prep;
// 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";
}
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.exec();
qDebug() << "prepped: " << prep;