mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: SqliteDb: Simplify migrateSqlScripts()

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-03-29 16:58:08 +03:00
parent 19f86b53e0
commit 65775fec45
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/ui/3rdparty/sqlite/sqlitedb.cpp vendored
View File

@ -347,54 +347,58 @@ bool SqliteDb::migrateDb(const MigrateOptions &opt, int userVersion, bool isNewD
bool SqliteDb::migrateSqlScripts(const MigrateOptions &opt, int userVersion, bool isNewDb)
{
const QDir dir(opt.sqlDir);
bool success = true;
const QDir sqlDir(opt.sqlDir);
bool ok = true;
beginWriteTransaction();
while (userVersion < opt.version) {
++userVersion;
const QString filePath = dir.filePath(QString("%1.sql").arg(userVersion));
beginSavepoint();
QFile file(filePath);
if (file.exists()) {
if (!file.open(QFile::ReadOnly | QFile::Text)) {
qCWarning(LC) << "Cannot open migration file" << filePath << file.errorString();
success = false;
break;
}
ok = migrateSqlScript(sqlDir, userVersion);
const QByteArray data = file.readAll();
if (data.isEmpty()) {
qCWarning(LC) << "Migration file is empty" << filePath;
success = false;
break;
}
success = execute(data.constData());
if (ok && opt.migrateFunc) {
ok = opt.migrateFunc(this, userVersion, isNewDb, opt.migrateContext);
}
if (success && opt.migrateFunc) {
success = opt.migrateFunc(this, userVersion, isNewDb, opt.migrateContext);
}
if (success) {
releaseSavepoint();
} else {
qCCritical(LC) << "Migration error:" << filePath << errorMessage();
if (!ok) {
qCCritical(LC) << "Migration error to version:" << userVersion << errorMessage();
rollbackSavepoint();
break;
}
releaseSavepoint();
}
this->setUserVersion(userVersion);
commitTransaction();
return success;
return ok;
}
bool SqliteDb::migrateSqlScript(const QDir &sqlDir, int userVersion)
{
const QString filePath = sqlDir.filePath(QString("%1.sql").arg(userVersion));
QFile file(filePath);
if (!file.exists())
return true;
if (!file.open(QFile::ReadOnly | QFile::Text)) {
qCWarning(LC) << "Cannot open migration file" << filePath << file.errorString();
return false;
}
const QByteArray data = file.readAll();
if (data.isEmpty()) {
qCWarning(LC) << "Migration file is empty" << filePath;
return false;
}
return execute(data.constData());
}
bool SqliteDb::migrateDbBegin(const MigrateOptions &opt, int &userVersion, bool &isNewDb)

3
src/ui/3rdparty/sqlite/sqlitedb.h vendored
View File

@ -8,6 +8,8 @@
#include <util/classhelpers.h>
QT_FORWARD_DECLARE_CLASS(QDir)
struct sqlite3;
class SqliteDb;
@ -126,6 +128,7 @@ private:
bool canMigrate(const MigrateOptions &opt) const;
bool migrateDb(const MigrateOptions &opt, int userVersion, bool isNewDb);
bool migrateSqlScripts(const MigrateOptions &opt, int userVersion, bool isNewDb);
bool migrateSqlScript(const QDir &sqlDir, int userVersion);
bool migrateDbBegin(const MigrateOptions &opt, int &userVersion, bool &isNewDb);
bool migrateDbEnd(const MigrateOptions &opt);