crtxcr/qswiki
1
0
Fork 0
Code Issues 21 Pull Requests 1 Releases Activity

revisiondaosqlite: Don't ignore page visibility setting

Browse Source
This commit is contained in:
Albert S. 2018-11-04 20:08:39 +01:00
parent 879a9f1c24
commit 89c662385d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/revisiondaosqlite.cpp
View File

@ -54,9 +54,8 @@ std::vector<Revision> RevisionDaoSqlite::getAllRevisions(QueryOption &options)
try try
{ {
SqliteQueryOption queryOption { options }; SqliteQueryOption queryOption { options };
std::string queryOptionSql = queryOption.setPrependWhere(true).setOrderByColumn("id").build(); std::string queryOptionSql = queryOption.setPrependWhere(true).setVisibleColumnName("page.visible").setOrderByColumn("revisionid").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;
auto query = *db << "SELECT author, comment, content, strftime('%s',creationtime), (SELECT name FROM page WHERE page.id = page ), revisionid FROM revision " + queryOptionSql;
query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid) query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid)
{ {
Revision r; Revision r;
@ -87,9 +86,8 @@ std::vector<Revision> RevisionDaoSqlite::getAllRevisionsForPage(std::string page
try try
{ {
SqliteQueryOption queryOption { option }; SqliteQueryOption queryOption { option };
std::string queryOptionSql = queryOption.setPrependWhere(false).setOrderByColumn("id").build(); std::string queryOptionSql = queryOption.setPrependWhere(false).setVisibleColumnName("page.visible").setOrderByColumn("revisionid").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;
auto query = *db << "SELECT (SELECT username FROM user WHERE id = author), comment, content, strftime('%s',creationtime), (SELECT name FROM page WHERE page.id = page ), revisionid FROM revision WHERE page = (SELECT id FROM page WHERE name = ?) " + queryOptionSql << pagename;
query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid) query >> [&](std::string author, std::string comment, std::string content, time_t creationtime, std::string page, unsigned int revisionid)
{ {