Superminaren/sample-hive
1
0
Fork 0
mirror of https://gitlab.com/samplehive/sample-hive.git synced 2026-10-24 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix database initializing before loading configuration file.

Browse Source
This commit is contained in:
apoorv569
2021-11-11 04:13:11 +05:30
parent c9b79a6935
commit e1d89d0b24
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Database/Database.cpp
+5 -4
View File
@@ -20,6 +20,7 @@
#include "Database/Database.hpp"
#include "Utility/Log.hpp"
#include "Utility/Paths.hpp"
#include <deque>
#include <exception>
@@ -77,9 +78,9 @@ class Sqlite3Statement
sqlite3_stmt* stmt = nullptr;
};
Database::Database(const std::string &dbPath)
Database::Database()
{
OpenDatabase(dbPath);
OpenDatabase();
}
Database::~Database()
@@ -1072,9 +1073,9 @@ Database::RestoreFromTrashByFilename(const std::string &filename,
return vecSet;
}
void Database::OpenDatabase(const std::string &dbPath)
void Database::OpenDatabase()
{
throw_on_sqlite3_error(sqlite3_open(dbPath.c_str(), &m_Database));
throw_on_sqlite3_error(sqlite3_open(static_cast<std::string>(DATABASE_FILEPATH).c_str(), &m_Database));
}
void Database::CloseDatabase()
src/Database/Database.hpp
+2 -2
View File
@@ -37,7 +37,7 @@
class Database
{
public:
Database(const std::string& dbPath);
Database();
~Database();
private:
@@ -48,7 +48,7 @@ class Database
private:
// -------------------------------------------------------------------
void OpenDatabase(const std::string& dbPath);
void OpenDatabase();
void CloseDatabase();
public: