create db at the right place

This commit is contained in:
Martin Brodbeck 2018-07-17 10:19:41 +02:00
parent c946bf6924
commit 5eef98074e
6 changed files with 40 additions and 22 deletions

View File

@ -1,17 +1,36 @@
#include "database.h" #include "database.h"
#include <filesystem>
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
Database::Database(const std::string& dbname) : db_(nullptr) Database::Database(const std::string& dbname)
{ {
dbname_ = dbname; dbname_ = dbname;
const int errCode = sqlite3_open(dbname_.c_str(), &db_); init();
if (errCode) { }
throw std::runtime_error("Could not open database file.");
Database::Database()
{
namespace fs = std::filesystem;
#if defined(__linux__)
fs::path dbpath = fs::path(std::getenv("HOME")) / ".local/share/kima2-cpp";
#elif defined(__WIN64) || defined(__WIN32)
fs::path dbpath = fs::path(std::getenv("LOCALAPPDATA") / "/kima2-cpp";
#else
throw std::runtime_error("Platform not supported.");
#endif
if (!fs::exists(dbpath)) {
try {
fs::create_directories(dbpath);
} catch (fs::filesystem_error& err) {
throw err;
}
} }
sqlite3_db_config(db_, SQLITE_DBCONFIG_ENABLE_FKEY); dbpath /= "kima2.db";
dbname_ = dbpath.string();
init();
} }
Database::~Database() { sqlite3_close(db_); } Database::~Database() { sqlite3_close(db_); }
@ -82,6 +101,12 @@ void Database::createNew()
void Database::init() void Database::init()
{ {
const int errCode = sqlite3_open(dbname_.c_str(), &db_);
if (errCode) {
throw std::runtime_error("Could not open database file.");
}
sqlite3_db_config(db_, SQLITE_DBCONFIG_ENABLE_FKEY);
int version = getVersion(); int version = getVersion();
switch (version) { switch (version) {
@ -253,7 +278,7 @@ unsigned int Database::storeSellers(std::vector<std::unique_ptr<Seller>>& seller
endTransaction(); endTransaction();
// Everything went fine, so we can now update our objects // Everything went fine, so we can now update our objects
sellers.erase(std::remove_if(sellers.begin(), sellers.end(), sellers.erase(std::remove_if(sellers.begin(), sellers.end(),
[](const std::unique_ptr<Seller>& seller) { [](const std::unique_ptr<Seller>& seller) {
return (seller->getState() == Seller::State::DELETE); return (seller->getState() == Seller::State::DELETE);

View File

@ -10,17 +10,18 @@
class Database class Database
{ {
public: public:
Database(const std::string& dbname); explicit Database(const std::string& dbname);
Database();
~Database(); ~Database();
Database(const Database&) = delete; Database(const Database&) = delete;
Database& operator=(const Database&) = delete; Database& operator=(const Database&) = delete;
void exec(const std::string& sql); void exec(const std::string& sql);
void init();
unsigned int storeSellers(std::vector<std::unique_ptr<Seller>>& sellers); unsigned int storeSellers(std::vector<std::unique_ptr<Seller>>& sellers);
private: private:
sqlite3* db_; sqlite3* db_{nullptr};
std::string dbname_; std::string dbname_;
void init();
void beginTransaction(); void beginTransaction();
void endTransaction(); void endTransaction();
void createNew(); void createNew();

View File

@ -12,10 +12,9 @@ Marketplace::Marketplace()
void Marketplace::storeToDb() void Marketplace::storeToDb()
{ {
const std::string DB_PATH{"/tmp/kima2.db"}; //const std::string DB_PATH{"/tmp/kima2.db"};
Database db(DB_PATH); Database db;
db.init();
db.storeSellers(sellers_); db.storeSellers(sellers_);
} }

View File

@ -18,4 +18,4 @@ set(GUI_SOURCES
) )
add_executable(kima2 ${GUI_SOURCES}) add_executable(kima2 ${GUI_SOURCES})
target_link_libraries(kima2 core Qt5::Widgets) target_link_libraries(kima2 core Qt5::Widgets stdc++fs)

View File

@ -1,13 +1,10 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <memory>
#include <QApplication> #include <QApplication>
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
//Q_INIT_RESOURCE(application); // Q_INIT_RESOURCE(application);
QApplication kimaApp{argc, argv}; QApplication kimaApp{argc, argv};

View File

@ -9,14 +9,12 @@
BOOST_AUTO_TEST_CASE(create_database) BOOST_AUTO_TEST_CASE(create_database)
{ {
Database db(":memory:"); BOOST_CHECK_NO_THROW(Database db(":memory:"));
BOOST_CHECK_NO_THROW(db.init());
} }
BOOST_AUTO_TEST_CASE(store_seller_fail) BOOST_AUTO_TEST_CASE(store_seller_fail)
{ {
Database db(":memory:"); Database db(":memory:");
db.init();
std::vector<std::unique_ptr<Seller>> sellers; std::vector<std::unique_ptr<Seller>> sellers;
sellers.push_back(std::make_unique<Seller>()); sellers.push_back(std::make_unique<Seller>());
sellers.push_back(std::make_unique<Seller>()); sellers.push_back(std::make_unique<Seller>());
@ -25,7 +23,6 @@ BOOST_AUTO_TEST_CASE(store_seller_fail)
BOOST_AUTO_TEST_CASE(store_sellers_succ) BOOST_AUTO_TEST_CASE(store_sellers_succ)
{ {
Database db(":memory:"); Database db(":memory:");
db.init();
std::vector<std::unique_ptr<Seller>> sellers; std::vector<std::unique_ptr<Seller>> sellers;
auto a = std::make_unique<Seller>(); auto a = std::make_unique<Seller>();
a->createUuid(); a->createUuid();
@ -47,7 +44,6 @@ BOOST_AUTO_TEST_CASE(store_sellers_succ)
BOOST_AUTO_TEST_CASE(seller_states) BOOST_AUTO_TEST_CASE(seller_states)
{ {
Database db(":memory:"); Database db(":memory:");
db.init();
std::vector<std::unique_ptr<Seller>> sellers; std::vector<std::unique_ptr<Seller>> sellers;
auto a = std::make_unique<Seller>(); auto a = std::make_unique<Seller>();
a->setSellerNo(3); a->setSellerNo(3);