ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #137: Properly close the DB even on failures.

pull/152/head
Jenkins 2019-04-12 13:42:30 +02:00
parent 6d01dbf5da 6c9281cd32
commit 49eb6c6047
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-core/usermanager.cpp
View File

@ -106,7 +106,7 @@ UserManager::UserManager(const QString &dbName, QObject *parent):
} }
/*! Will return true if the database is working fine but doesn't have any information on users whatsoever. /*! Will return true if the database is working fine but doesn't have any information on users whatsoever.
* That is, neither a user nor an anonimous token. * That is, neither a user nor an anonymous token.
* This may be used to determine whether a first-time setup is required. * This may be used to determine whether a first-time setup is required.
*/ */
bool UserManager::initRequired() const bool UserManager::initRequired() const
@ -373,6 +373,7 @@ bool UserManager::initDB()
m_db.exec("CREATE TABLE users (username VARCHAR(40) UNIQUE, password VARCHAR(100), salt VARCHAR(100));"); m_db.exec("CREATE TABLE users (username VARCHAR(40) UNIQUE, password VARCHAR(100), salt VARCHAR(100));");
if (m_db.lastError().isValid()) { if (m_db.lastError().isValid()) {
qCWarning(dcUserManager) << "Error initualizing user database. Driver error:" << m_db.lastError().driverText() << "Database error:" << m_db.lastError().databaseText(); qCWarning(dcUserManager) << "Error initualizing user database. Driver error:" << m_db.lastError().driverText() << "Database error:" << m_db.lastError().databaseText();
m_db.close();
return false; return false;
} }
} }
@ -381,7 +382,8 @@ bool UserManager::initDB()
qCDebug(dcUserManager()) << "Empty user database. Setting up metadata..."; qCDebug(dcUserManager()) << "Empty user database. Setting up metadata...";
m_db.exec("CREATE TABLE tokens (id VARCHAR(40) UNIQUE, username VARCHAR(40), token VARCHAR(100) UNIQUE, creationdate DATETIME, devicename VARCHAR(40));"); m_db.exec("CREATE TABLE tokens (id VARCHAR(40) UNIQUE, username VARCHAR(40), token VARCHAR(100) UNIQUE, creationdate DATETIME, devicename VARCHAR(40));");
if (m_db.lastError().isValid()) { if (m_db.lastError().isValid()) {
qCWarning(dcUserManager()) << "Error initualizing user database. Driver error:" << m_db.lastError().driverText() << "Database error:" << m_db.lastError().databaseText(); qCWarning(dcUserManager()) << "Error initializing user database. Driver error:" << m_db.lastError().driverText() << "Database error:" << m_db.lastError().databaseText();
m_db.close();
return false; return false;
} }
} }