mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 20:44:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create unique database connections per thread and remove them using the database connection name from the QSqlDatabase instance being used.

Browse Source
This commit is contained in:
Luis Ángel San Martín
2018-04-24 20:53:24 +02:00
parent 0ff7da1d2c
commit 52c76d5482
7 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
YACReaderLibrary/db_helper.cpp
View File

@ -40,7 +40,7 @@ QList<LibraryItem *> DBHelper::getFolderSubfoldersFromLibrary(qulonglong library
QList<LibraryItem *> list = DBHelper::getFoldersFromParent(folderId,db,false);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
QList<LibraryItem *> DBHelper::getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId)
@ -56,7 +56,7 @@ QList<LibraryItem *> DBHelper::getFolderComicsFromLibrary(qulonglong libraryId,
QList<LibraryItem *> list = DBHelper::getComicsFromParent(folderId,db,sort);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -86,7 +86,7 @@ quint32 DBHelper::getNumChildrenFromFolder(qulonglong libraryId, qulonglong fold
}
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return result;
}
@ -99,7 +99,7 @@ qulonglong DBHelper::getParentFromComicFolderId(qulonglong libraryId, qulonglong
Folder f = DBHelper::loadFolder(id,db);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return f.parentId;
}
ComicDB DBHelper::getComicInfo(qulonglong libraryId, qulonglong id)
@ -110,7 +110,7 @@ ComicDB DBHelper::getComicInfo(qulonglong libraryId, qulonglong id)
ComicDB comic = DBHelper::loadComic(id,db);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return comic;
}
@ -121,7 +121,7 @@ QList<ComicDB> DBHelper::getSiblings(qulonglong libraryId, qulonglong parentId)
QList<ComicDB> comics = DBHelper::getSortedComicsFromParent(parentId,db);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return comics;
}
@ -145,7 +145,7 @@ QString DBHelper::getFolderName(qulonglong libraryId, qulonglong id)
}
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return name;
}
QList<QString> DBHelper::getLibrariesNames()
@ -193,7 +193,9 @@ QList<ComicDB> DBHelper::getLabelComics(qulonglong libraryId, qulonglong labelId
}
db.close();
}
}
//TODO ?
//QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -235,7 +237,9 @@ QList<ComicDB> DBHelper::getFavorites(qulonglong libraryId)
db.close();
}
//TODO ?
//QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -273,7 +277,9 @@ QList<ComicDB> DBHelper::getReading(qulonglong libraryId)
db.close();
}
//TODO ?
//QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -310,7 +316,10 @@ QList<ReadingList> DBHelper::getReadingLists(qulonglong libraryId)
list.insert(i,item);
}
}
//TODO ?
//QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -362,8 +371,11 @@ QList<ComicDB> DBHelper::getReadingListFullContent(qulonglong libraryId, qulongl
list.append(comic);
}
}
}
}
//TODO ?
//QSqlDatabase::removeDatabase(db.connectionName());
return list;
}
@ -479,7 +491,7 @@ void DBHelper::update(qulonglong libraryId, ComicInfo & comicInfo)
DBHelper::update(&comicInfo,db);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
}
void DBHelper::update(ComicInfo * comicInfo, QSqlDatabase & db)
@ -689,7 +701,7 @@ void DBHelper::updateProgress(qulonglong libraryId, const ComicInfo &comicInfo)
DBHelper::updateReadingRemoteProgress(comic.info,db);
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
}
void DBHelper::updateReadingRemoteProgress(const ComicInfo &comicInfo, QSqlDatabase &db)
@ -741,7 +753,7 @@ void DBHelper::updateFromRemoteClient(qulonglong libraryId,const ComicInfo & com
}
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
}
void DBHelper::renameLabel(qulonglong id, const QString &name, QSqlDatabase &db)
@ -1293,7 +1305,7 @@ QList<Label> DBHelper::getLabels(qulonglong libraryId)
}
db.close();
QSqlDatabase::removeDatabase(libraryPath);
QSqlDatabase::removeDatabase(db.connectionName());
return labels;
}