From 08968935a4ee0e7595340ccdb7abfa2d9ea7591c Mon Sep 17 00:00:00 2001 From: Albert S Date: Fri, 16 Nov 2018 16:50:39 +0100 Subject: [PATCH] revisiondaosqlite: fix sorting --- database/revisiondaosqlite.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/revisiondaosqlite.cpp b/database/revisiondaosqlite.cpp index 61bfad2..c4914fe 100644 --- a/database/revisiondaosqlite.cpp +++ b/database/revisiondaosqlite.cpp @@ -54,7 +54,7 @@ std::vector RevisionDaoSqlite::getAllRevisions(QueryOption &options) try { SqliteQueryOption queryOption { options }; - std::string queryOptionSql = queryOption.setPrependWhere(true).setVisibleColumnName("page.visible").setOrderByColumn("revisionid").build(); + std::string queryOptionSql = queryOption.setPrependWhere(true).setVisibleColumnName("page.visible").setOrderByColumn("creationtime").build(); auto query = *db << "SELECT (SELECT username FROM user WHERE id = author), comment, content, strftime('%s',creationtime), page.name, revisionid FROM revision INNER JOIN page ON revision.page = page.id " + queryOptionSql; query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid) { @@ -86,7 +86,7 @@ std::vector RevisionDaoSqlite::getAllRevisionsForPage(std::string page try { SqliteQueryOption queryOption { option }; - std::string queryOptionSql = queryOption.setPrependWhere(false).setVisibleColumnName("page.visible").setOrderByColumn("revisionid").build(); + std::string queryOptionSql = queryOption.setPrependWhere(false).setVisibleColumnName("page.visible").setOrderByColumn("creationtime").build(); auto query = *db << "SELECT (SELECT username FROM user WHERE id = author), comment, content, strftime('%s',creationtime), page.name, revisionid FROM revision INNER JOIN page ON revision.page = page.id WHERE page.name = ? AND " + queryOptionSql << pagename; query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid)