crtxcr/looqs
1
0
派生 0
代码 工单 合并请求 1 版本发布 百科 动态

search: fixed: order by after group by in content search

浏览代码
这个提交包含在：
Albert S. 2019-04-27 21:23:06 +02:00
父节点 7df1ddf891
当前提交 6f92b9ff5a
共有 1 个文件被更改，包括 3 次插入 和 2 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

5
shared/sqlitesearch.cpp
查看文件

@ -104,7 +104,7 @@ QString SqliteSearch::createSortSql(const SqliteSearch::Token &token)
// sort:(mtime desc, page asc) // sort:(mtime desc, page asc)
if(token.key == "sort") if(token.key == "sort")
{ {
QString sortsql = " ORDER BY "; QString sortsql;
QStringList splitted_inner = token.value.split(","); QStringList splitted_inner = token.value.split(",");
for(int i = 0; i < splitted_inner.length(); i++) for(int i = 0; i < splitted_inner.length(); i++)
{ {
@ -230,7 +230,7 @@ QSqlQuery SqliteSearch::makeSqlQuery(const QVector<SqliteSearch::Token> &tokens)
prepSql = prepSql =
"SELECT file.path AS path, group_concat(content.page) AS pages, file.mtime AS mtime, file.size AS size, " "SELECT file.path AS path, group_concat(content.page) AS pages, file.mtime AS mtime, file.size AS size, "
"file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid WHERE 1=1 AND " + "file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid WHERE 1=1 AND " +
whereSql + " " + sortSql + " GROUP BY file.path"; whereSql + " GROUP BY file.path " + sortSql;
} }
else else
{ {
@ -265,6 +265,7 @@ QVector<SearchResult> SqliteSearch::search(const QString &query)
{ {
qDebug() << dbQuery.lastError(); qDebug() << dbQuery.lastError();
qDebug() << dbQuery.executedQuery();
throw QSSGeneralException("SQL Error: " + dbQuery.lastError().text()); throw QSSGeneralException("SQL Error: " + dbQuery.lastError().text());
} }