1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00

Merge changes

This commit is contained in:
Laurent Cozic
2017-01-02 16:28:03 +01:00
parent 9cd3554e4a
commit 65d93d4b6d
8 changed files with 133 additions and 21 deletions

View File

@ -24,7 +24,7 @@ int Folder::count() {
}
QVector<Folder> Folder::all(const QString &orderBy) {
QSqlQuery q("SELECT " + BaseModel::tableFieldNames(jop::FoldersTable).join(",") + " FROM folders ORDER BY " + orderBy);
QSqlQuery q("SELECT " + BaseModel::tableFieldNames(jop::FoldersTable).join(",") + " FROM " + BaseModel::tableName(jop::FoldersTable) + " ORDER BY " + orderBy);
jop::db().execQuery(q);
QVector<Folder> output;