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

{page,categorydao}sqlite: Add missing ROLLBACK

This commit is contained in:
Albert S. 2023-08-09 13:53:49 +02:00
parent c0049fc7b6
commit 8a2d9fdc58
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/categorydaosqlite.cpp
View File

@ -72,6 +72,7 @@ void CategoryDaoSqlite::deleteCategory(std::string name)
}
catch(sqlite::sqlite_exception &e)
{
*db << "ROLLBACK";
throwFrom(e);
}
}
@ -105,18 +106,21 @@ std::vector<Page> CategoryDaoSqlite::fetchMembers(std::string name, QueryOption
try
{
auto query = *db << "SELECT page.id, page.name AS name, page.title, page.lastrevision, page.visible FROM categorymember INNER JOIN page ON page.id = "
auto query = *db << "SELECT page.id, page.name AS name, page.title, page.lastrevision, page.visible FROM "
"categorymember INNER JOIN page ON page.id = "
"categorymember.page WHERE category = (SELECT id FROM category WHERE name = ? ) AND " +
queryoptions
<< name;
query >> [&](unsigned int id, std::string name, std::string title, unsigned int lastrevision, bool visible) {
query >> [&](unsigned int id, std::string name, std::string title, unsigned int lastrevision, bool visible)
{
Page p;
p.name = name;
p.pageid = id;
p.title = title;
p.current_revision = lastrevision;
p.listed = visible;
result.push_back(p); };
result.push_back(p);
};
}
catch(const sqlite::exceptions::no_rows &e)
{

9
database/pagedaosqlite.cpp
View File

@ -109,6 +109,7 @@ void PageDaoSqlite::deletePage(std::string page)
}
catch(sqlite::sqlite_exception &e)
{
*db << "ROLLBACK";
throwFrom(e);
}
}
@ -140,15 +141,17 @@ std::vector<Page> PageDaoSqlite::getPageList(QueryOption option)
.setPrependWhere(true)
.build();
std::string query = "SELECT id, name, title, lastrevision, visible FROM page " + queryOption;
*db << query >> [&](unsigned int pageid, std::string name, std::string title,unsigned int current_revision, bool visible ) {
*db << query >>
[&](unsigned int pageid, std::string name, std::string title, unsigned int current_revision, bool visible)
{
Page tmp;
tmp.pageid = pageid;
tmp.name = name;
tmp.title = title;
tmp.current_revision = current_revision;
tmp.listed = visible;
result.push_back(tmp); };
result.push_back(tmp);
};
}
catch(const sqlite::errors::no_rows &e)
{