Label for admin exit, main interface looped

Have hashing and verification functs ready.

.clang-format

@@ -1,12 +1,22 @@
 BasedOnStyle: LLVM
 IndentWidth: 4
-#-------------
+
+#--- cpp
 
 Language: Cpp
-
 PointerAlignment: Left
-ColumnLimit: 120
-AllowAllArgumentsOnNextLine: true
-BreakConstructorInitializersStyle : BCIS_AfterColon
+ColumnLimit: 100
+AlignAfterOpenBracket: Align 
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: false
+BreakConstructorInitializers: BeforeColon 
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 Cpp11BracedListStyle: true
+IncludeBlocks: Regroup
+
+#---

CMakeLists.txt

@@ -1,19 +1,51 @@
-cmake_minimum_required(VERSION 3.14)
-project(park)
-
-set(CMAKE_CXX_STANDARD 11)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp)
-
-include_directories(
-        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp/include
-)
-
-
-add_executable(park main.cpp data.cpp headers/data.h Customer.cpp headers/Customer.h  Park_spot.cpp headers/Park_spot.h Park_time.cpp headers/Park_time.h)
-
-target_link_libraries(park
-        SQLiteCpp
-        sqlite3
-        pthread
-        dl
-        )
+cmake_minimum_required(VERSION 3.10)
+project(park)
+
+set(CMAKE_CXX_STANDARD 11)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp)
+
+include_directories(
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp/include
+)
+
+
+add_executable(park
+        main.cpp
+
+        data.cpp
+        headers/data.h
+        encrypt.cpp
+        headers/encrypt.h
+
+        Customer.cpp
+        headers/Customer.h
+        Park_spot.cpp
+        headers/Park_spot.h
+        Park_time.cpp
+        headers/Park_time.h
+        Query.cpp
+        headers/Query.h
+        Interface.cpp
+        headers/Interface.h
+ )
+
+
+
+
+if (UNIX)
+        target_link_libraries(park
+        SQLiteCpp
+        sqlite3
+        pthread
+        dl
+        sodium
+        )
+elseif (MSYS OR MINGW)
+        target_link_libraries(park
+        SQLiteCpp
+        sqlite3
+        pthread
+        ssp
+        libsodium
+        )
+endif()

Customer.cpp

@@ -1,100 +1,98 @@
-#include "headers/Customer.h"
-#include <iostream>
-
-// constructors
-Customer::Customer(string name_, Verhicle_type verhicle_, SQLite::Database& db):
-    name{name_}, verhicle{verhicle_},
-    card_code{gen_cardcode()}
-{
-    id = auto_increment_db(db) + 1;
-    save_db(db);
-}
-
-Customer::Customer(int id_, string name_, string card_code_, Verhicle_type verhicle_, vector<Park_time> instances)
-    : name{name_}, 
-     card_code{card_code_},
-     verhicle{verhicle_},
-     park_instances{instances}
-{
-
-}
-
-
-
-// clock methods ====================================================================================
-/*
-creert een park_time object met start time= nu, en voegt t toe aan een vector.
- */
-void Customer::clock_in(int s_id) {
-    Park_time pt{id, s_id};
-    park_instances.push_back(pt);
-}
-
-// edit de laatste park_time obj in de vector zodat de end_time = now.
-void Customer::clock_out(int s_id) { park_instances[park_instances.size() - 1].clock_out(id, s_id); }
-
-// report gen
-void Customer::gen_monthly() {
-    std::cout << "NAME: " << name << " card code: " << card_code << "\n";
-    std::cout << "-------------------------------------------------\n";
-    for (auto& i : park_instances) {
-        // TODO: need some logic to only include from this month
-        std::cout << i;
-    }
-    std::cout << "-------------------------------------------------\n\n";
-}
-
-//================================================================================================
-// functions that interact with the database
-
-void Customer::save_db(SQLite::Database& database) {
-    string statement{"insert into Customer values (, '', '', );"};
-    // after ( = 28)
-    statement.insert(38, std::to_string(int(verhicle)));
-    statement.insert(36, card_code);
-    statement.insert(32, name);
-    statement.insert(29, "null");
-    SQLite::Transaction transaction(database);
-    database.exec(statement);
-    transaction.commit();
-}
-
-void Customer::update_db(SQLite::Database& database) {
-    string statement = "UPDATE Customer SET name = \"\", card_code = \"\" where id = '';";
-    statement.insert(58, std::to_string(id));
-    statement.insert(44, card_code);
-    statement.insert(28, name);
-    // std::cout << statement; TODO: set some logging here
-    database.exec(statement);
-}
-
-void Customer::delete_db(SQLite::Database& database) {
-    string statement = "delete from Customer where id= ;";
-    statement.insert(statement.length() - 2, std::to_string(id));
-    // std::cout << statement;
-    SQLite::Transaction transaction(database);
-    database.exec(statement);
-    transaction.commit();
-}
-
-int Customer::auto_increment_db(SQLite::Database& database) {
-    SQLite::Statement max_id(database, "select max(id) from Customer;");
-    int id = 0;
-    max_id.executeStep();
-    id = max_id.getColumn(0);
-    max_id.reset();
-    return id;
-}
-
-// random helpers=============================================================
-std::mt19937 mt(time(0));
-std::uniform_int_distribution<int> dist(65, 127);
-
-string Customer::gen_cardcode() {
-    string code;
-    for (int i = 0; i < 20; i++) {
-        char letter = char(dist(mt));
-        code += letter;
-    }
-    return code;
-}
+#include "headers/Customer.h"
+
+
+// constructors
+Customer::Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_)
+    : id{auto_increment_db() + 1},
+      name{name_},
+      password{hash_password(password_)},
+      vehicle{vehicle_},
+      telephone{telephone_} {
+    save_db();
+}
+
+Customer::Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
+                   vector<Park_time> instances, string telephone_)
+    : id{id_},
+      name{name_},
+      password{password_},
+      vehicle{vehicle_},
+      park_instances{instances},
+      telephone{telephone_} {}
+
+// clock in/out methods
+// ====================================================================================
+/*
+Create a p_time object with start=now and adds to vector
+ */
+void Customer::clock_in(int s_id) {
+    Park_time pt{id, s_id};
+    park_instances.push_back(pt);
+}
+
+// edit last p_time object so end=now
+void Customer::clock_out(int s_id) {
+    park_instances[park_instances.size() - 1].clock_out(id, s_id);
+}
+
+bool Customer::parked() {
+    if (!park_instances.size()) {
+        return false;
+    }
+    if ((park_instances[park_instances.size() - 1].duration)) {
+        // if duration of the last parktime == 0, meaning
+        // that the customer has not clocked out
+        return false;
+    } else {
+        return true;
+    }
+}
+
+int Customer::parked_at() { return park_instances[park_instances.size() - 1].spot_id; }
+
+//================================================================================================
+// functions that interact with the database
+
+void Customer::save_db() {
+    string statement{"insert into Customer values (, '', '', ,'');"};
+    // after ( = 28)
+    statement.insert(41, telephone);
+    statement.insert(38, to_string(int(vehicle)));
+    statement.insert(36, password);
+    statement.insert(32, name);
+    statement.insert(29, to_string(id));
+    // cout << statement;
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+
+void Customer::update_db() {
+    string statement =
+        "UPDATE Customer SET name = '', password = '', "
+        "vehicle = '', telephone = '' where id = '';";
+    statement.insert(87, to_string(id));
+    statement.insert(73, telephone);
+    statement.insert(57, to_string(int(vehicle)));
+    statement.insert(43, password);
+    statement.insert(28, name);
+    // cout << statement;
+    data::db.exec(statement);
+}
+
+void Customer::delete_db() {
+    string statement = "delete from Customer where id= ;";
+    statement.insert(statement.length() - 2, to_string(id));
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+
+int Customer::auto_increment_db() {
+    SQLite::Statement max_id(data::db, "select max(id) from Customer;");
+    int id = 0;
+    max_id.executeStep();
+    id = max_id.getColumn(0);
+    max_id.reset();
+    return id;
+}

Interface.cpp

@@ -0,0 +1,198 @@
+#include "headers/Interface.h"
+
+// I added it to pass spots, because the parking options need it to check where
+// is free parking_spots is declared in main, and if i declare it
+// liberal use of
+// cin.ignore(10000, '\n');
+// so it skips to the next newline, in essence clearing the cin buffer
+
+void interface(vector<Park_spot>& spots) {
+    int selector;
+    cout << "\nHello and welcome to the parking spot! Please select a suitable "
+            "option:";
+    cout << "\n[1]Log in as member";
+    cout << "\n[2]Log in as administrator";
+    cin >> selector;
+    cin.ignore(10000, '\n');
+    switch (selector) {
+    case 1: {
+        interface_member(spots);
+        break;
+    }
+    case 2: {
+        interface_admin(spots);
+        break;
+    }
+    }
+}
+
+void interface_member(vector<Park_spot>& spots) {
+    __label__ exit;
+    int id;
+    string password;
+    cout << "\nPlease input id:";
+    cin >> id;
+    cin.ignore(10000, '\n');
+    Customer c = query_customer_with_id(id);
+    cout << "\nPlease input password:";
+    std::getline(cin, password);
+    while (!(verify_password(c.password, password))) {
+        cout << "ERROR: wrong password. Please retype your password or enter [exit] to exit :\n";
+        std::getline(cin, password);
+        if (password=="exit") goto exit;
+    }
+
+    cout << "Logged in succesfully\n";
+    cout << "select an option\n [1] Parking options\n[2]monthy report\n";
+    int option;
+    cin >> option;
+    cin.ignore(10000, '\n');
+    switch (option) {
+    case 1: {
+        park(c, spots);
+        break;
+    }
+    case 2: {
+        cout << "Has not been implemented yet\n";
+        break;
+    }
+
+    default:
+        break;
+    }
+    exit: ;
+}
+
+void interface_admin(vector<Park_spot>& spots) {
+    __label__ exit, begin;
+    begin: ;
+    cout << "Welcome to the admin interface. It is not completely ready yet.\n";
+    cout << "[1] See monthly report of ALL parking spots\n";
+    cout << "[2] See weekly report of ALL parking spots\n";
+    cout << "[3] See monthly report of a specific parking spot\n";
+    cout << "[4] See weekly report of a specific parking spot\n";
+    cout << "[5] See current status of parking spots\n";
+    cout << "[6] Make new customer\n";
+    cout << "[7] Make new parking spot\n";
+    cout << "[8] Exit\n";
+    cout << "option[1-7]:";
+    int option;
+    cin >> option;
+    cin.ignore(10000, '\n');
+    switch (option) {
+    case 1: {
+        reports_from_allparkspots();
+        break;
+    }
+    case 2: {
+        reports_from_allparkspots(true);
+        break;
+    }
+    case 3: {
+        cout << "Which parking spot would you like a report on?ID:";
+        int spotid;
+        cin >> spotid;
+        cin.ignore(10000, '\n');
+        reports_from_parkspot(spotid);
+        break;
+    }
+    case 4: {
+        cout << "Which parking spot would you like a report on?ID:";
+        int spotid;
+        cin >> spotid;
+        cin.ignore(10000, '\n');
+        reports_from_parkspot(spotid, true);
+        break;
+    }
+    case 5: {
+        current_status_parkspots(spots);
+        break;
+    }
+    case 6: {
+        new_customer();
+        break;
+    }
+    case 7: {
+        new_parkspot(spots);
+        break;
+    }
+
+    case 8: {
+        goto exit;
+        break;
+    }
+
+    default:
+        break;
+    }
+goto begin;
+exit: ;
+}
+
+// --------- individual things.
+
+void park(Customer& c, vector<Park_spot>& spots) {
+    cout << "You have selected parking option";
+    if (!(c.parked())) {
+        cout << "The following spots[which can fit your vehicle] are "
+                "available: ";
+        for (Park_spot i : spots) {
+            if (i.v_type == c.vehicle) {
+                cout << i.id << ", ";
+            }
+        }
+
+        cout << "where do you want to park?";
+        int parkid;
+        cin >> parkid;
+        cin.ignore(10000, '\n');
+        for (Park_spot& i : spots) {
+            if (i.id == parkid) {
+                i.clock(c);
+                cout << "You have parked sucessfully";
+            }
+        }
+
+    } else {
+        cout << "You are parked at spot " << c.parked_at()
+             << ", do you want to clock out?\n enter [1] for yes and [0] for no";
+        int answer = 0;
+        cin >> answer;
+        cin.ignore(10000, '\n');
+        if (answer) {
+            query_parkspot_with_id(c.parked_at(), spots).clock(c);
+            cout << "You have sucessfully clocked out.";
+        } else {
+            cout << "OK, have a nice day";
+        }
+    }
+}
+
+void new_customer() {
+    int vtype;
+    string name;
+    string password;
+    string telephone;
+    cout << "What's the name of the customer? ";
+    std::getline(cin, name);
+    cout << "What's the vehicle type? [1]twoweeler, [2] fourweeler: ";
+    cin >> vtype;
+    cin.ignore(10000, '\n');
+    cout << "What's the telephone number? ";
+    std::getline(cin, telephone);
+    cout << "What's the password?";
+    std::getline(cin, password);
+    Customer newcustomer{name, password, Vehicle_type(vtype), telephone};
+    cout << "New customer sucessfully created\n";
+    newcustomer.update_db();
+}
+
+void new_parkspot(vector<Park_spot>& spots) {
+    cout << "What type of parking spot? [1] Twowheeler, [2] Fourwheeler: ";
+    int vtype;
+    cin >> vtype;
+    cin.ignore(10000, '\n');
+    Park_spot newspot{Vehicle_type(vtype)};
+    spots.push_back(newspot);
+    cout << "New parking spot sucessfully created.\n";
+}

Park_spot.cpp

@@ -1,21 +1,76 @@
 #include "headers/Park_spot.h"
 
-Park_spot::Park_spot(int id_){
-    parked = nullptr;
-    id = id_;
-    taken = false;
+// constructors
+
+Park_spot::Park_spot(Vehicle_type v_type_)
+    : parked_customer{0}, id{auto_increment_db() + 1}, taken{false}, v_type{v_type_} {
+    save_db();
 }
 
-// clock in en out, calls de juist(in/out) van de customer aan de hand van internal state van taken
-void Park_spot::clock(Customer* c_customer){
-    if (!taken){
-        parked = c_customer;
+Park_spot::Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_)
+    : parked_customer{parked},
+      id{id_},
+      v_type{v_type_},
+      taken{taken_} // TODO: think about how init parked?
+{}
+
+// clock in en out, calls de juist(in/out) van de customer aan de hand van
+// internal state van taken
+void Park_spot::clock(Customer& c_customer) {
+    if (!taken) {
+        parked_customer = c_customer.id;
         taken = true;
-        parked->clock_in(id);
-    }
-    else{
+        c_customer.clock_in(id);
+        update_db();
+    } else {
         taken = false;
-        parked->clock_out(id);
-        parked = nullptr;
+        c_customer.clock_out(id);
+        parked_customer = 0;
+        update_db();
     }
-}
+}
+
+// --------------------- db functs
+
+void Park_spot::update_db() {
+    string statement = "UPDATE Park_spot SET taken = '', customer_id  = '' where id = '';";
+    statement.insert(63, to_string(id));
+    if (taken) {
+        statement.insert(49, to_string(parked_customer));
+        statement.insert(30, "1");
+    } else {
+        statement.insert(49, "NULL");
+        statement.insert(30, "0");
+    }
+    data::db.exec(statement);
+}
+
+void Park_spot::save_db() {
+    //(int id, bool taken, int customer_id)
+    string statement{"insert into Park_spot values ( , , , );"};
+    // after ( = 28)
+    statement.insert(36, to_string(int(v_type)));
+    statement.insert(34, "NULL");
+    statement.insert(32, "0");
+    statement.insert(30, to_string(id));
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+
+void Park_spot::delete_db() {
+    string statement = "delete from Park_spot where id= ;";
+    statement.insert(statement.length() - 2, to_string(id));
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+
+int Park_spot::auto_increment_db() {
+    SQLite::Statement max_id(data::db, "select max(id) from Park_spot;");
+    int id = 0;
+    max_id.executeStep();
+    id = max_id.getColumn(0);
+    max_id.reset();
+    return id;
+}

Park_time.cpp

@@ -1,45 +1,124 @@
-#include"headers/Park_time.h"
-#include <iostream>
-#include <ctime>
-
+#include "headers/Park_time.h"
 
+/*
+initializes everything, id is auto incremented from what's stored in the db.
+inmediately saves to db upon creation.
+Also, this weird syntax is called an initializer list, and is the preffered
+method of how to initialize members. It has a measurable performance increase
+because it uses move semantics instead of copy semantics.
+https://www.geeksforgeeks.org/when-do-we-use-initializer-list-in-c/
+ */
 Park_time::Park_time(int c_id, int s_id)
-    : customer_id { c_id }
-    , spot_id { s_id }
-    , duration { 0 }
-    , start { high_resolution_clock::now() }
-{
+    : customer_id{c_id},
+      spot_id{s_id},
+      duration{0},
+      start{high_resolution_clock::now()},
+      id{auto_increment_db() + 1} {
+    save_db();
+}
+/*
+this one initializes with data from the database. should probably only be used in the query
+functions.
+ */
+Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_)
+    : id{id_}, customer_id{customer_id_}, spot_id{spot_id_}, duration{duration_} {
+    start = time_point<system_clock>(seconds(start_));
+    end = time_point<system_clock>(seconds(start_ + duration_));
 }
 
-void Park_time::clock_out(int c_id, int s_id)
-{
+/*
+simple checking if customer is clocking out at the right spot.
+sets end(time of clocking out) and calculates the duration.
+updates the info in the database.
+
+ */
+void Park_time::clock_out(int c_id, int s_id) {
 
     if (c_id != customer_id) {
-        std::cout << "wrong customer id, you are at the wrong location";
+        cout << "wrong customer id, you are at the wrong location";
         return;
     }
     if (s_id != spot_id) {
-        std::cout << "Wrong spot id, you're at the wrong location";
+        cout << "Wrong spot id, you're at the wrong location";
         return;
     }
 
     if (!duration) {
         end = high_resolution_clock::now();
         duration = duration_cast<seconds>(end - start).count(); // use mins later
+        update_db();
 
     } else {
-        std::cout << "Already clocked out. Something is wrong \n";
+        cout << "Already clocked out. Something is wrong \n";
     }
 }
 
-
-std::ostream& operator<<(std::ostream& os, const Park_time & pt){
+std::ostream& operator<<(std::ostream& os, const Park_time& pt) {
     std::time_t start_ = system_clock::to_time_t(pt.start);
     std::time_t end_ = system_clock::to_time_t(pt.end);
     os << "- - - - - - - - - - - - - - - - - - - -\n";
+    os << "Customer # " << pt.customer_id << "at parking spot " << pt.spot_id << "\n";
     os << "Clocked in :" << std::ctime(&start_);
     os << "clocked out : " << std::ctime(&end_);
     os << "duration : " << pt.duration << "\n";
     os << "- - - - - - - - - - - - - - - - - - - -\n";
     return os;
+}
+// mostly a helper function to ease the conversion from timepoint to int
+// for storing in the db
+int Park_time::start_to_int() {
+    auto start_to_epoch = start.time_since_epoch();
+    auto start_value = duration_cast<seconds>(start_to_epoch);
+    int start_seconds = start_value.count();
+    return start_seconds;
+}
+
+// db funcs
+// -----------------------------------------------------------------------------
+
+void Park_time::save_db() {
+    /*
+    this creates a sql statement and then executes it
+     */
+    string statement{"insert into Park_time values ( , , , , , );"};
+    statement.insert(41, "NULL");
+    statement.insert(39, "NULL");
+    statement.insert(37, to_string(start_to_int()));
+    statement.insert(35, to_string(spot_id));
+    statement.insert(33, to_string(customer_id));
+    statement.insert(31, to_string(id));
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+// same as above
+void Park_time::update_db() {
+    string statement = "UPDATE Park_time SET end = , duration =  where id = '';";
+    statement.insert(53, to_string(id));
+    statement.insert(40, to_string(duration));
+    statement.insert(27, to_string(start_to_int() + duration));
+    data::db.exec(statement);
+}
+
+// to get id on first save to db
+int Park_time::auto_increment_db() {
+    SQLite::Statement max_id(data::db, "select max(id) from Park_time;");
+    int id = 0;
+    max_id.executeStep();
+    id = max_id.getColumn(0);
+    max_id.reset();
+    return id;
+}
+
+//------------------ test function to help test this
+
+void Wait(int sec)
+
+{
+    /*
+a wait function where 1 sec represents 1 hour irl. It has been used for testing
+purposes mostly. TODO: Needs to be removed at completion of project, or seperated in a test
+cpp/header
+ */
+    std::this_thread::sleep_for(seconds{sec});
 }

Query.cpp

@@ -0,0 +1,172 @@
+#include "headers/Query.h"
+
+vector<Park_time> query_parktimes_for_customer(int cid) {
+    /*
+    This is needed to initialize the park_instances for the customer constructor
+    that is supposed to create a customer from data in the db.
+    This should not be called on on it's own outside query_customer();
+     */
+    vector<Park_time> park_times;
+
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE customer_id = ?;");
+    query.bind(1, cid);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int spot_id = query.getColumn(2);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+
+        Park_time result{id, cid, spot_id, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+    return park_times;
+}
+
+//--------------------------------------------- customers
+
+vector<Customer> query_customer_with_name(string name) {
+    /*
+    We use this instead of plain customers because:
+    1. no error handling needed here if there are no customers
+    2. multiple customers could be returned with the same name.
+     */
+    vector<Customer> result;
+    SQLite::Statement query(data::db,
+                            "SELECT id, name, password, vehicle FROM Customer WHERE name = ?;");
+    query.bind(1, name);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        string name_ = query.getColumn(1);
+        string password = query.getColumn(2);
+        int vehicle = query.getColumn(3); // cast to vehicle
+        string telephone = query.getColumn(4);
+        vector<Park_time> park_instances = query_parktimes_for_customer(id);
+        result.push_back(
+            Customer{id, name_, password, Vehicle_type(vehicle), park_instances, telephone});
+    }
+    return result;
+}
+
+Customer query_customer_with_id(int id) {
+    /*  do not call this function if you are not certain a customer with this id
+    exists.
+    // the only legitimate caller of this function is query_parkspot_x
+    // there is no error handling in this function
+    // for when this function doesn't find the customer with this id !!!!
+    */
+
+    SQLite::Statement query(data::db, "SELECT * FROM Customer WHERE id = ?;");
+    query.bind(1, id);
+    while (query.executeStep()) {
+        string name = query.getColumn(1);
+        string password = query.getColumn(2);
+        int vehicle = query.getColumn(3); // cast to vehicle
+        string telephone = query.getColumn(4);
+        vector<Park_time> park_instances = query_parktimes_for_customer(id);
+        Customer result{id, name, password, Vehicle_type(vehicle), park_instances, telephone};
+        // DEBUG
+        // cout << "{" << result.id << "," <<result.password <<"," <<
+        // int(vehicle) << "}\n";
+        return result;
+    }
+}
+
+//------------------------------- parkspot info
+
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots) {
+    for (Park_spot& i : parkspots) {
+        if (i.id == id) {
+            return i;
+        }
+    }
+}
+
+void reports_from_parkspot(int spotid, bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
+    }
+
+    int s_since_epoch = mktime(now);
+
+    vector<Park_time> park_times;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE spot_id = ? AND start > ?;");
+    query.bind(1, spotid);
+    query.bind(2, s_since_epoch);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int cid = query.getColumn(1);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+        Park_time result{id, cid, spotid, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+
+    for (auto i : park_times) {
+        cout << i;
+    }
+}
+
+void reports_from_allparkspots(bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
+    }
+
+    int s_since_epoch = mktime(now);
+
+    vector<Park_time> park_times;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE start > ?;");
+    query.bind(1, s_since_epoch);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int cid = query.getColumn(1);
+        int spotid = query.getColumn(2);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+        Park_time result{id, cid, spotid, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+
+    for (auto i : park_times) {
+        cout << i;
+    }
+}
+
+void current_status_parkspots(vector<Park_spot>& spots) {
+    for (auto& i : spots) {
+        cout << "---------------------------\n";
+        cout << "PS #" << i.id << "\n";
+        cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
+        if (i.taken) {
+            cout << "Customer#" << i.parked_customer << "  parked there\n";
+        }
+    }
+}
+
+// -------------- parking spots
+
+// vector<Park_spot> populate_spots(){
+//         vector<Park_spot> spots;
+//     SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id >
+//     0;");
+//     // query.bind(1, 2);
+//     while (query.executeStep()) {
+//         int id = query.getColumn(0);
+//         int taken = query.getColumn(1);
+//         int cid = query.getColumn(2);
+//         // park_customers.push_back(query_customer_with_id(cid));
+//         spots.push_back({id, taken, cid});
+//     }
+//     return spots;
+// }

cmake_install.cmake

@@ -1,54 +0,0 @@
-# Install script for directory: /home/massive/dev/Parkmanne
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "/usr/local")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  if(BUILD_TYPE)
-    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  else()
-    set(CMAKE_INSTALL_CONFIG_NAME "")
-  endif()
-  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
-  if(COMPONENT)
-    message(STATUS "Install component: \"${COMPONENT}\"")
-    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  else()
-    set(CMAKE_INSTALL_COMPONENT)
-  endif()
-endif()
-
-# Install shared libraries without execute permission?
-if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  set(CMAKE_INSTALL_SO_NO_EXE "0")
-endif()
-
-# Is this installation the result of a crosscompile?
-if(NOT DEFINED CMAKE_CROSSCOMPILING)
-  set(CMAKE_CROSSCOMPILING "FALSE")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCAL_ONLY)
-  # Include the install script for the subdirectory.
-  include("/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/cmake_install.cmake")
-endif()
-
-if(CMAKE_INSTALL_COMPONENT)
-  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-else()
-  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-endif()
-
-string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
-       "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "/home/massive/dev/Parkmanne/${CMAKE_INSTALL_MANIFEST}"
-     "${CMAKE_INSTALL_MANIFEST_CONTENT}")

data.cpp

@@ -3,11 +3,28 @@
 namespace data {
 
 SQLite::Database start_db() {
+    /*
+    Opens the database, creates it if it can't find the file.
+     */
     SQLite::Database db("test.db3", SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE);
-
-    db.exec("create table if not exists Customer (id integer primary key, name text, card_code varchar(20), verhicle int)");
-    db.exec("create table if not exists Park_spot (id integer primary key, taken boolean, customer_id int)");
-    db.exec("create table if not exists Park_time (id integer primary key, customer_id int, spot_id int, start real, end real, duration real)");
+    while (sodium_init() < 0) {
+        std::cout << "SODIUM NOT WORKING";
+        /*
+        This shouldn't be here, really, but I can't think of a better place
+        where it runs at least once. This seeds the random generator needed for
+        salts and other stuff, and needs to be run at least once when working
+        with any libsodium function.
+         */
+    }
+    db.exec(
+        "create table if not exists Customer (id integer primary key, name "
+        "text, password text, vehicle int, telephone text)");
+    db.exec(
+        "create table if not exists Park_spot (id integer primary key, taken "
+        "int, customer_id int, vehicle_type int)");
+    db.exec(
+        "create table if not exists Park_time (id integer primary key, "
+        "customer_id int, spot_id int, start int, end int, duration int)");
 
     return db;
 }

encrypt.cpp

@@ -0,0 +1,37 @@
+#include "headers/encrypt.h"
+
+string hash_password(string password) {
+    /*
+    Passing strings and converting to char* because I do not want to be forced
+    to use char * whenever I want to call the function. Low level stuff in the
+    function, the least possible low level stuff outside.
+    This uses the password hashing algorithm Argon2 implemented by libsodium.
+    DO NOT MODIFY memory_limit and cpu_limit after you add customers to the db.
+    When you do that, the hashed passwords can't be decrypted, and that would be
+    BAD
+     */
+    const char* password_ = password.c_str();
+    char hashed_password_[crypto_pwhash_STRBYTES];
+    int memory_limit = 3.2e+7; // 3.2e7 = 32e6 = 32 mb
+    int cpu_limit = 1;         // this is n_threads
+
+    int result =
+        crypto_pwhash_str(hashed_password_, password_, strlen(password_), cpu_limit, memory_limit);
+    string hashed_password{hashed_password_};
+
+    return hashed_password;
+}
+
+bool verify_password(string hashed_password, string unhashed_password) {
+    /*
+    this verifies the password. It's encryption magic and don't question it.
+     */
+    const char* password_ = unhashed_password.c_str();
+    const char* hashed_password_ = hashed_password.c_str();
+
+    if (crypto_pwhash_str_verify(hashed_password_, password_, strlen(password_)) != 0) {
+        return false;
+    } else {
+        return true;
+    }
+}

headers/Customer.h

@@ -1,58 +1,60 @@
 #ifndef CUSTOMER_H
 #define CUSTOMER_H
 #pragma once
-#include "../thirdparty/SQLiteCpp/include/SQLiteCpp/SQLiteCpp.h"
+
 #include "Park_time.h"
-#include <ctime>
-#include <random>
-#include <string>
+#include "data.h"
+
 #include <vector>
 
-using std::string;
 using std::vector;
 
-// enum type is basically een manier om categories te representen als een integer in the background, maar om t in code
-// aan te geven als de actual category.
-enum class Verhicle_type {
-    small = 1,
-    medium = 2,
-    large = 3,
-};
+/*
+enum classes make it easy to represent categories.
+So you can use something like Vehicle_type::car instead of 2. but under the
+hood, it's still an int. This is here so you won't have to have global variables
+for these categories, or worse, use magic numbers in the code.
+
+ */
+enum class Vehicle_type { twoweeler = 1, fourweeler = 2 };
 
 /*
-card code is een randomly generated string moeten zijn, die je bv. op een nfc card zou opslaan en zo zou
-authenticaten bij je parking spot. We kunnen dit ipv of samen met een password gebruiken.
-clock in en out creeert en compleet een park_time object. Voegt het toe aan een vector.
+Customer constructors do the same stuff as all the other constructors.
+clock_in and out create and modify park_time objects and store them to
+park_instances. Technically, now that we have a working db, we don't need it.
+TODO: fix this.
 
-*/
+gen_monthly just prints out all the park_time objects in park_instances.
+It should (and can safely) be removed, but it's here as a quick example of
+report generation It has no logic to speak of that only generates report of
+ptime objects of this month.
+TODO: remove when have seperate report generation functions.
+
+save, update, delete and auto increment are the same as in park_time.
+ */
 
 class Customer {
   public:
-    Customer(string name_, Verhicle_type verhicle_, SQLite::Database& db);
-    Customer(int id_, string name_, string card_code_, Verhicle_type verhicle_,
-             vector<Park_time> instances); // needed to construct from db
-    // potentially: add a destructor that calls update_db() before being destroyed
     int id;
     string name;
-    string card_code;
-
+    string password;
+    Vehicle_type vehicle;
+    string telephone;
+    Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_);
+    Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
+             vector<Park_time> instances, string telephone_);
     void clock_in(int s_id);
     void clock_out(int s_id);
+    bool parked();
+    int parked_at();
 
-    void update_db(SQLite::Database& database);
-    void delete_db(SQLite::Database& database);
-
-    // void gen_weekly(); TODO: this
-    void gen_monthly();
+    void update_db();
+    void delete_db();
 
   private:
-    Verhicle_type verhicle;
     vector<Park_time> park_instances;
-
-    string gen_cardcode();
-
-    void save_db(SQLite::Database& database);
-    int auto_increment_db(SQLite::Database& database);
+    void save_db();
+    int auto_increment_db();
 };
 
 #endif // CUSTOMER_H

headers/Interface.h

@@ -0,0 +1,13 @@
+
+
+#include "Query.h"
+
+
+using std::cin;
+
+void interface(vector<Park_spot>& spots);
+void interface_member(vector<Park_spot>& spots);
+void interface_admin(vector<Park_spot>& spots);
+void park(Customer& c, vector<Park_spot>& spots);
+void new_customer();
+void new_parkspot(vector<Park_spot>& spots);

headers/Park_spot.h

@@ -1,21 +1,33 @@
+#ifndef PARK_SPOT_H
+#define PARK_SPOT_H
+#pragma once
+
 #include "Customer.h"
-
-
 /*
 db representation:
 int id not null
 bool taken not null
 int customer_id (null) (many to one, foreign key, whatever)
 
-Dit representeert een parkeerplaats. Het heeft als internal state alleen dat t bezet is of niet.
+Dit representeert een parkeerplaats. Het heeft als internal state alleen dat t
+bezet is of niet.
 */
 
 class Park_spot {
-    public:
+  public:
     int id;
     bool taken;
-    Customer* parked; //TODO: think about memory management
-    Park_spot(int id_);
-    void clock(Customer* c_customer);
-    private:
-};
+    int parked_customer;
+    Vehicle_type v_type;
+
+    Park_spot(Vehicle_type v_type_);
+    Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_);
+    void clock(Customer& c_customer);
+
+  private:
+    void save_db();
+    void update_db();
+    void delete_db();
+    int auto_increment_db();
+};
+#endif // CUSTOMER_H

headers/Park_time.h

@@ -2,42 +2,69 @@
 #define PARK_TIME_H
 #pragma once
 
-#include <chrono>
-#include <iostream>
+#include "data.h"
 
+#include <chrono>
+#include <ctime>
+#include <iostream>
+#include <string>
+#include <thread>
 
 using namespace std::chrono;
-
+using std::cout;
+using std::string;
+using std::to_string;
 /*
-db repr of Park_time
-int id (not null, auto increment)
-int customer_id (not null) (many to one or something like that)
-int spot_id (not null, many to one or something like that)
-int duration 
-datetime start (not null)
-datetime end
 
-Dit is gewoon een record van hoe lang, wie en waar iemand parkeert. Basically, een component van 
-de internal state van customer.
+
+Record of who parked at what park_spot and at what time.
+public interface-------------------------------------------
+
+The constructors. one for creating new customers, the other one used by the
+query functions to construct the object from information stored in the database.
+
+clock_out is the function that gets called from customer.clock_out().
+It verifies that the customer is clocking out at the correct parkspot, and saves
+the current time of clocking out in end. It also calculates duration so it
+doesn't have to be calculated more than once.
+
+operator<< is << overload, can(should) be used for report generation.
+
+
+// implementation stuff------------------------
+start and end are time points representing when someone clocks in and out. they're from the chrono
+namespace.
+
+save and update save and update info in the database.
+auto_increment pulls the highest id stored in the db, to be used in the constructor.
+
+start_to_int() is used to convert the start timepoint to an integer that can be saved in the
+database SQL datetime and chrono datetime don't seem the most compatible.
+
 */
 
 class Park_time {
-public:
+  public:
+    Park_time(int c_id, int s_id);
+    Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_);
     int id;
     int customer_id;
     int spot_id;
     int duration;
-    Park_time(int c_id, int s_id);
-    void clock_out(int c_id, int s_id);
-    friend std::ostream& operator<<(std::ostream& os, const  Park_time & pt);
 
-private:
+    void clock_out(int c_id, int s_id);
+    friend std::ostream& operator<<(std::ostream& os, const Park_time& pt);
+
+  private:
     high_resolution_clock::time_point start;
     high_resolution_clock::time_point end;
-    //TODO: discuss pros cons of using chrono, ctime, or 3th party lib
+    void save_db();
+    void update_db();
+    int auto_increment_db(); // helper
+    int start_to_int();      // helper
 };
 
-
-
+// test funciton
+void Wait(int sec);
 
 #endif // Park_time

headers/Query.h

@@ -0,0 +1,67 @@
+#ifndef QUERY_H
+#define QUERY_H
+#pragma once
+
+#include "Park_spot.h"
+
+/*these are the functions that search the database and create objects from it.
+
+query_parktimes_for_customer searches for the parktimes  that are needed in
+customer initialisaiton. generally, i see no use outside of that.
+
+query_customer_with_name searches for customer data by name.
+
+query_customer_with_id does what the above does, but with id.
+
+
+populate_spots is used to query for all the park_spots and return them as
+objects.
+
+The design desision to use vector<T> instead of <T> is for the following
+reasons:
+
+1. some of these can potentially return more than one object. For example, 2
+customers who have the same name.
+
+2. I have no clue how many of you have done error handling in c++
+(try/catch/finally).
+Ya boi is nice and doesn't want to bombard you with more new concepts than needed.
+so now you'd do
+
+vector<Customer> test = query_customer_with_name("Testman");
+
+if (!test.size()) {print no customers found, do stuff}
+else if (test.size() > 1) { do stuff to get the right one if you only need one
+}
+
+instead of
+try {
+    customer test = query_customer_with_name("Testman");
+}
+catch(someException.probablycalled_not_found) {do_Stuff};
+catch(...) {
+    do stuff
+}
+finally{
+    do more stuff
+}
+
+3. Ya boi needs to brush up on how to create custom exceptions class, and it will complicate code
+furhter.
+
+ */
+
+vector<Park_time> query_parktimes_for_customer(int cid);
+
+vector<Customer> query_customer_with_name(string name);
+Customer query_customer_with_id(int id);
+
+vector<Park_spot> populate_spots();
+
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
+
+void reports_from_parkspot(int spotid, bool weekly = false);
+void reports_from_allparkspots(bool weekly = false);
+
+void current_status_parkspots(vector<Park_spot>& spots);
+#endif // CUSTOMER_H

headers/data.h

@@ -1,6 +1,19 @@
+#ifndef DATA_H
+#define DATA_H
+#pragma once
 #include "../thirdparty/SQLiteCpp/include/SQLiteCpp/SQLiteCpp.h"
-#include "Customer.h"
-namespace data {
-SQLite::Database start_db();
+#include "encrypt.h"
 
-}
+namespace data {
+
+/*
+start_db is the function that opens the database, and
+if the necesary tables are not there, creates them.
+db is the database, and is static to avoid multiple redefinition errors.
+ */
+SQLite::Database start_db();
+static SQLite::Database db = start_db();
+
+} // namespace data
+
+#endif

headers/encrypt.h

@@ -0,0 +1,23 @@
+#ifndef ENCRYPT_H
+#define ENCRYPT_H
+#pragma once
+
+#include <cstring>
+#include <iostream>
+#include <sodium.h>
+#include <string>
+
+using std::string;
+/*
+hash_password takes the password, and encrypts it. This needs to be done,
+because storing passwords in plaintext is BAD!
+
+verify_password takes in a password and the hashed password, and then does magic encryption
+stuff(no, not really. It basically hashes the password with the same salt and other parameters) and
+to see if the password stored and the given password match.
+ */
+
+string hash_password(string password);
+bool verify_password(string hashed_password, string unhashed_password);
+
+#endif

main.cpp

@@ -1,39 +1,69 @@
-#include "headers/Park_spot.h"
-#include "headers/data.h"
-#include <iostream>
-#include <thread> // to make pausing work, not sure if i need chrono, or this, or both
-#include <vector>
-
-/*
-Code strucure like this:
-class declarations zijn in /headers/class_naam.h, en definitions van de member
-functs in /class_naam.cpp elke klas in zn eigen file omdat ik incomplete class
-declarations wilt tegengaan, omdat ik ze niet goed begrijp. En header/source
-split om multiple definition errors tegen te gaan.
-
-Park_spot representeert een parkeermeter bij elke parkeer spot.
-Een customer is een customer.
-Park time is een object die reffereert naar parkspot en customer, basically een
-record die zegt dat een customer voor x tijd geparkeert heeft bij spot x, enz.
-
-De client clockt in en uit bij een spot.
- */
-
-void Wait(int sec)
-/*
-a wait function where 1 sec represents 1 hour irl.
- */
-{
-    std::this_thread::sleep_for(seconds{sec});
-}
-
-using std::cout;
-
-int main() {
-
-    SQLite::Database db = data::start_db();
-    // see implementation of update_db, save_db and delete_db of customer to see how queries and statements work
-    Customer sagar{"Ramsaransing", Verhicle_type::medium, db};
-    sagar.update_db(db);
-    sagar.delete_db(db);
-}
+#include "headers/Interface.h"
+
+/*
+Code structure is like this:
+1. encrypt.cpp en /header/encrypt.h contain functions to hash passwords and
+verify passwords
+
+2. data.cpp and /header/data.h contain the code to start up the database.
+Originally, they were supposed to contain all the functions to save to the
+database and query from the database. I had trouble doing that, (cyclical
+includes) and some other issues. the other issues are gone due to the latest
+refactor, but to make it like my original plan is going to take a few hours, and
+I have done too much already to want to do more work unless needed.
+The functions to save to a database have been integrated in the classes
+themself, and unless issues arrise from that I'm not changing that. Functions to
+get objects from the database are in Query.cpp en header.
+
+3. Park_time.cpp en header.
+Contain the implementation details of Park_time, which is basically a record of
+who parked at what spot and when. Uses a mix of ctime and chrono functions to do
+most of the stuff, it's a mess. I will probably have to commit to Doing it one
+way or the other to make it more comperhensible, especially for whoever will
+make report functions.
+
+4. Customer.cpp and header.
+Contains the implementation of Customer. Customer represents a customer, and
+saves park_time instances in itself. Not much to explain.
+
+5. Park_spot.cpp and header.
+It contians the implementation details of Park_spot, which represents it's
+namesake.
+
+6. Query.cpp and header.
+Cointain functions that search the database and return objects(P_time, P_spot,
+Customer) It is the least tested of the whole project, use with care.
+
+Explanation of what members do of P_time, P_spot, Customer are in the respective
+headers. Explanations of how the member functions work(Or how I intended for
+them to work) are in the respective .cpp files. void Wait(int sec)
+ */
+
+static vector<Park_spot> parking_spots = populate_spots();
+// this queries the db for all the saved parking_spots and initializes them
+static vector<Customer> park_customers;
+
+int main() {
+    // state of db:
+    // er zijn 10 parkspots, 5 met biketype en 5 met pickup type
+    // er is een customer met id 1(testcustomer) met password "password"
+do {    interface(parking_spots);} while (true);
+}
+
+/*
+Why is this not in query.cpp? Because somehow, it errors out when it's there.
+The error message indicates it is a memory issue but I suspect it's a
+concurrency issue. Do not move this.
+ */
+vector<Park_spot> populate_spots() {
+    vector<Park_spot> spots;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id > 0;");
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int taken = query.getColumn(1);
+        int cid = query.getColumn(2);
+        Vehicle_type vtype = Vehicle_type(int(query.getColumn(3)));
+        spots.push_back({id, taken, cid, vtype});
+    }
+    return spots;
+}

readme.md

@@ -1,10 +1,33 @@
-
-use 
-```
-g++ main.cpp Park_time.cpp Customer.cpp Park_spot.cpp -o test.exe
-```
-to build the project
-
-# Parkmanne
-## A stroll in the park
-Parkmanne aims to achieve provisionary effectiveness in the sector of parking. This problem had. 
+
+use 
+```
+cmake -G "MinGW Makefiles" -S ./ -B ./build/
+mingw32-make
+```
+to build the project.
+it will generate the .exe in /build/park.exe
+Or click the build icon in vscode *shrugs* 
+
+
+# Parkmanne
+## A stroll in the park
+
+
+This is a graph of how everything is connected.
+If you need to add functionality that doesn't fall in any of these, and you're unsure of what to include, you can decide something like this:
+
+Take my customer class for example. 
+It needs to be able to save to db, so it needs data.
+It needs to modify and save park_time objects, so it needs those. 
+It needs to encrypt and decrypt passwords. BUT since data already includes encrypt, it doesn't have to be encrypted.
+So customer includes those.
+
+Another example is Parkspot.
+It needs information about both customers and save to the database.
+Since customer also includes data, i don't have to include it again.
+
+Last example:
+
+
+![header includes](graph.png)
+

thirdparty/SQLiteCpp/CMakeLists.txt

@@ -1,338 +1,338 @@
-# Main CMake file for compiling the library itself, examples and tests.
-#
-# Copyright (c) 2012-2019 Sebastien Rombauts (sebastien.rombauts@gmail.com)
-#
-# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
-# or copy at http://opensource.org/licenses/MIT)
-cmake_minimum_required(VERSION 2.8.12) # first version with add_compile_options()
-project(SQLiteCpp)
-
-message (STATUS "CMake version: ${CMAKE_VERSION}")
-
-# Define useful variables to handle OS differences:
-if (WIN32)
-    set(DEV_NULL                "NUL")
-else (WIN32) # UNIX
-    set(DEV_NULL                "/dev/null")
-endif (WIN32)
-
-# then Compiler/IDE differences:
-if (MSVC)
-    set(CPPLINT_ARG_OUTPUT      "--output=vs7")
-    set(CPPCHECK_ARG_TEMPLATE   "--template=vs")
-    # disable Visual Studio warnings for fopen() used in the example
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-    # Flags for linking with multithread static C++ runtime, required by googletest
-    if (SQLITECPP_BUILD_TESTS)
-        message(STATUS "Linking against multithread static C++ runtime for unit tests with googletest")
-        set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE} /MT")
-        set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG} /MTd")
-        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-        set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-    endif (SQLITECPP_BUILD_TESTS)
-    # Handle the (partly supported) MSVC versions prior to 2015
-    if (MSVC_VERSION LESS 1900) # OR MSVC_TOOLSET_VERSION LESS 140)
-      message(WARNING "MSVC < 2015 detected: Visual Studio prior to 2015 is not fully supported. BLOB storage seems to be corrupted.")
-    endif (MSVC_VERSION LESS 1900)
-else (MSVC)
-    set(CPPLINT_ARG_OUTPUT      "--output=eclipse")
-    set(CPPCHECK_ARG_TEMPLATE   "--template=gcc")
-    # Useful compile flags and extra warnings
-    add_compile_options(-fstack-protector -Wall -Wextra -Wpedantic -Wno-long-long -Wswitch-enum -Wshadow -Winline)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++0x-compat") # C++ only
-    if (CMAKE_COMPILER_IS_GNUCXX)
-        # GCC flags
-        option(SQLITECPP_USE_GCOV "USE GCov instrumentation." OFF)
-        if (SQLITECPP_USE_GCOV)
-            message (STATUS "Using GCov instrumentation")
-            add_compile_options (-coverage) # NOTE -fkeep-inline-functions would be usefull but not working with current google test and gcc 4.8
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -coverage")
-        endif ()
-    endif (CMAKE_COMPILER_IS_GNUCXX)
-endif (MSVC)
-# and then common variables
-set(CPPLINT_ARG_VERBOSE "--verbose=3")
-set(CPPLINT_ARG_LINELENGTH "--linelength=120")
-
-# Print CXX compiler information
-message (STATUS "CMAKE_CXX_COMPILER '${CMAKE_CXX_COMPILER}' '${CMAKE_CXX_COMPILER_ID}' '${CMAKE_CXX_COMPILER_VERSION}'")
-
-# Print CXX FLAGS
-message (STATUS "CMAKE_CXX_FLAGS                '${CMAKE_CXX_FLAGS}'")
-if (MSVC)
-    message (STATUS "CMAKE_CXX_FLAGS_DEBUG          '${CMAKE_CXX_FLAGS_DEBUG}'")
-    message (STATUS "CMAKE_CXX_FLAGS_RELEASE        '${CMAKE_CXX_FLAGS_RELEASE}'")
-    message (STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO '${CMAKE_CXX_FLAGS_RELWITHDEBINFO}'")
-    message (STATUS "CMAKE_CXX_FLAGS_MINSIZEREL     '${CMAKE_CXX_FLAGS_MINSIZEREL}'")
-else (NOT MSVC)
-    if     (CMAKE_BUILD_TYPE STREQUAL Debug)
-        message (STATUS "CMAKE_CXX_FLAGS_DEBUG          '${CMAKE_CXX_FLAGS_DEBUG}'")
-    elseif (CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-        message (STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO '${CMAKE_CXX_FLAGS_RELWITHDEBINFO}'")
-    elseif (CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
-        message (STATUS "CMAKE_CXX_FLAGS_MINSIZEREL     '${CMAKE_CXX_FLAGS_MINSIZEREL}'")
-    else ()
-        message (STATUS "CMAKE_CXX_FLAGS_RELEASE        '${CMAKE_CXX_FLAGS_RELEASE}'")
-    endif ()
-endif ()
-
-# Options relative to SQLite and SQLiteC++ functions
-
-option(SQLITE_ENABLE_COLUMN_METADATA "Enable Column::getColumnOriginName(). Require support from sqlite3 library." ON)
-if (SQLITE_ENABLE_COLUMN_METADATA)
-    # Enable the use of SQLite column metadata and Column::getColumnOriginName() method,
-    # Require that the sqlite3 library is also compiled with this flag (default under Debian/Ubuntu, but not on Mac OS X).
-    add_definitions(-DSQLITE_ENABLE_COLUMN_METADATA)
-endif (SQLITE_ENABLE_COLUMN_METADATA)
-
-option(SQLITE_ENABLE_ASSERT_HANDLER "Enable the user defintion of a assertion_failed() handler." OFF)
-if (SQLITE_ENABLE_ASSERT_HANDLER)
-    # Enable the user defintion of a assertion_failed() handler (default to false, easier to handler for begginers).
-    add_definitions(-DSQLITECPP_ENABLE_ASSERT_HANDLER)
-endif (SQLITE_ENABLE_ASSERT_HANDLER)
-
-option(SQLITE_USE_LEGACY_STRUCT "Fallback to forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)" OFF)
-if (SQLITE_USE_LEGACY_STRUCT)
-    # Force forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)
-    add_definitions(-DSQLITE_USE_LEGACY_STRUCT)
-endif (SQLITE_USE_LEGACY_STRUCT)
-
-
-## Build the C++ Wrapper ##
-
-# adding a new file require explicittly modifing the CMakeLists.txt
-# so that CMake knows that it should rebuild the project (it is best practice)
-
-# list of sources files of the library
-set(SQLITECPP_SRC
- ${PROJECT_SOURCE_DIR}/src/Backup.cpp
- ${PROJECT_SOURCE_DIR}/src/Column.cpp
- ${PROJECT_SOURCE_DIR}/src/Database.cpp
- ${PROJECT_SOURCE_DIR}/src/Exception.cpp
- ${PROJECT_SOURCE_DIR}/src/Statement.cpp
- ${PROJECT_SOURCE_DIR}/src/Transaction.cpp
-)
-source_group(src FILES ${SQLITECPP_SRC})
-
-# list of header files of the library
-set(SQLITECPP_INC
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/SQLiteCpp.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Assertion.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Backup.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Column.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Database.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Exception.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Statement.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Transaction.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Utils.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/VariadicBind.h
- ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/ExecuteMany.h
-)
-source_group(include FILES ${SQLITECPP_INC})
-
-# list of test files of the library
-set(SQLITECPP_TESTS
- tests/Column_test.cpp
- tests/Database_test.cpp
- tests/Statement_test.cpp
- tests/Backup_test.cpp
- tests/Transaction_test.cpp
- tests/VariadicBind_test.cpp
- tests/Exception_test.cpp
- tests/ExecuteMany_test.cpp
-)
-source_group(tests FILES ${SQLITECPP_TESTS})
-
-# list of example files of the library
-set(SQLITECPP_EXAMPLES
- examples/example1/main.cpp
-)
-source_group(example1 FILES ${SQLITECPP_EXAMPLES})
-
-# list of doc files of the library
-set(SQLITECPP_DOC
- README.md
- LICENSE.txt
- CHANGELOG.md
- TODO.txt
-)
-source_group(doc FILES ${SQLITECPP_DOC})
-
-# list of script files of the library
-set(SQLITECPP_SCRIPT
- .travis.yml
- appveyor.yml
- build.bat
- build.sh
- cpplint.py
- Doxyfile
- FindSQLiteCpp.cmake
-)
-source_group(scripts FILES ${SQLITECPP_SCRIPT})
-
-# All includes are relative to the "include" directory
-include_directories("${PROJECT_SOURCE_DIR}/include")
-
-# add sources of the wrapper as a "SQLiteCpp" static library
-add_library(SQLiteCpp ${SQLITECPP_SRC} ${SQLITECPP_INC} ${SQLITECPP_DOC} ${SQLITECPP_SCRIPT})
-# make the sqlite3 library part of the interface of the SQLiteCpp wrapper itself (the client app does not need to link to sqlite3)
-# PR https://github.com/SRombauts/SQLiteCpp/pull/111 "linked SQLiteCpp to sqlite3" commented out since it breaks install step from PR #118
-#target_link_libraries(SQLiteCpp PUBLIC sqlite3)
-
-if (UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
-    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-fPIC")
-endif (UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
-
-# Allow the library to be installed via "make install" and found with "find_package"
-install(TARGETS SQLiteCpp
-    EXPORT ${PROJECT_NAME}Config
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    COMPONENT libraries)
-target_include_directories(SQLiteCpp PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include/>)
-install(DIRECTORY include/ DESTINATION include COMPONENT headers FILES_MATCHING REGEX ".*\\.(hpp|h)$")
-install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
-
-## Build provided copy of SQLite3 C library ##
-
-# TODO 
-#find_package(sqlite3)
-#if(sqlite3_VERSION VERSION_LESS "3.19")
-#    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
-#endif()
-
-option(SQLITECPP_USE_ASAN "Use Address Sanitizer." OFF)
-if (SQLITECPP_USE_ASAN)
-    if ((CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 6) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-        message (STATUS "Using Address Sanitizer")
-        set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-        if (CMAKE_COMPILER_IS_GNUCXX)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-        endif ()
-    endif ()
-endif (SQLITECPP_USE_ASAN)
-
-option(SQLITECPP_INTERNAL_SQLITE "Add the internal SQLite3 source to the project." ON)
-if (SQLITECPP_INTERNAL_SQLITE)
-    # build the SQLite3 C library (for ease of use/compatibility) versus Linux sqlite3-dev package
-    add_subdirectory(sqlite3)
-    target_include_directories(sqlite3 PUBLIC "${PROJECT_SOURCE_DIR}/sqlite3")
-    target_include_directories(SQLiteCpp PRIVATE "${PROJECT_SOURCE_DIR}/sqlite3")
-endif (SQLITECPP_INTERNAL_SQLITE)
-
-# Optional additional targets:
-
-option(SQLITECPP_RUN_CPPLINT "Run cpplint.py tool for Google C++ StyleGuide." ON)
-if (SQLITECPP_RUN_CPPLINT)
-    find_package(PythonInterp)
-    if (PYTHONINTERP_FOUND)
-        # add a cpplint target to the "all" target
-        add_custom_target(SQLiteCpp_cpplint
-         ALL
-         COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
-        )
-    endif (PYTHONINTERP_FOUND)
-else (SQLITECPP_RUN_CPPLINT)
-    message(STATUS "SQLITECPP_RUN_CPPLINT OFF")
-endif (SQLITECPP_RUN_CPPLINT)
-
-option(SQLITECPP_RUN_CPPCHECK "Run cppcheck C++ static analysis tool." ON)
-if (SQLITECPP_RUN_CPPCHECK)
-    find_program(CPPCHECK_EXECUTABLE NAMES cppcheck)
-    if (CPPCHECK_EXECUTABLE)
-        # add a cppcheck target to the "all" target
-        add_custom_target(SQLiteCpp_cppcheck
-         ALL
-         COMMAND ${CPPCHECK_EXECUTABLE} -j 8 cppcheck --enable=style --quiet ${CPPCHECK_ARG_TEMPLATE} ${PROJECT_SOURCE_DIR}/src
-        )
-        execute_process(COMMAND "${CPPCHECK_EXECUTABLE}" --version OUTPUT_VARIABLE CPPCHECK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-        message(STATUS "Found Cppcheck: ${CPPCHECK_EXECUTABLE} ${CPPCHECK_VERSION}")
-    else (CPPCHECK_EXECUTABLE)
-        message(STATUS "Could NOT find cppcheck")
-    endif (CPPCHECK_EXECUTABLE)
-else (SQLITECPP_RUN_CPPCHECK)
-    message(STATUS "SQLITECPP_RUN_CPPCHECK OFF")
-endif (SQLITECPP_RUN_CPPCHECK)
-
-option(SQLITECPP_RUN_DOXYGEN "Run Doxygen C++ documentation tool." OFF)
-if (SQLITECPP_RUN_DOXYGEN)
-    find_package(Doxygen)
-    if (DOXYGEN_FOUND)
-        # add a Doxygen target to the "all" target
-        add_custom_target(SQLiteCpp_doxygen
-         ALL
-         COMMAND doxygen Doxyfile > ${DEV_NULL}
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        )
-    endif (DOXYGEN_FOUND)
-else (SQLITECPP_RUN_DOXYGEN)
-    message(STATUS "SQLITECPP_RUN_DOXYGEN OFF")
-endif (SQLITECPP_RUN_DOXYGEN)
-
-option(SQLITECPP_BUILD_EXAMPLES "Build examples." OFF)
-if (SQLITECPP_BUILD_EXAMPLES)
-    # add the basic example executable
-    add_executable(SQLiteCpp_example1 ${SQLITECPP_EXAMPLES})
-    target_link_libraries(SQLiteCpp_example1 SQLiteCpp sqlite3)
-    # Link target with pthread and dl for linux
-    if (UNIX)
-        target_link_libraries(SQLiteCpp_example1 pthread)
-        if (NOT APPLE)
-            target_link_libraries(SQLiteCpp_example1 dl)
-        endif ()
-    elseif (MSYS OR MINGW)
-        target_link_libraries(SQLiteCpp_example1 ssp)
-    endif ()
-else (SQLITECPP_BUILD_EXAMPLES)
-    message(STATUS "SQLITECPP_BUILD_EXAMPLES OFF")
-endif (SQLITECPP_BUILD_EXAMPLES)
-
-option(SQLITECPP_BUILD_TESTS "Build and run tests." OFF)
-if (SQLITECPP_BUILD_TESTS)
-    # deactivate some warnings for compiling the gtest library
-    if (NOT MSVC)
-        add_compile_options(-Wno-variadic-macros -Wno-long-long -Wno-switch-enum -Wno-float-equal -Wno-conversion-null -Wno-switch-default -Wno-pedantic)
-    endif (NOT MSVC)
-
-    # add the subdirectory containing the CMakeLists.txt for the gtest library
-    # TODO: under Linux, uses libgtest-dev if found
-    if (NOT EXISTS "${PROJECT_SOURCE_DIR}/googletest/CMakeLists.txt")
-        message(FATAL_ERROR "Missing 'googletest' submodule! Either use 'git submodule init' and 'git submodule update' to get googletest according to the README, or deactivate unit tests with -DSQLITECPP_BUILD_TESTS=OFF")
-    endif ()
-    add_subdirectory(googletest)
-    include_directories("${PROJECT_SOURCE_DIR}/googletest/googletest/include")
-
-    # Add definitions to keep googletest from making the compilation fail
-    if (MSVC)
-        if (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141)
-            target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-            target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-            target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-            target_compile_definitions(gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-        endif (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919)
-    endif (MSVC)
-
-    # add the unit test executable
-    add_executable(SQLiteCpp_tests ${SQLITECPP_TESTS})
-    target_link_libraries(SQLiteCpp_tests gtest_main SQLiteCpp sqlite3)
-    # Link target with dl for linux
-    if (UNIX AND NOT APPLE)
-        target_link_libraries(SQLiteCpp_tests dl)
-    endif ()
-
-    # add a "test" target:
-    enable_testing()
-
-    # does the tests pass?
-    add_test(UnitTests SQLiteCpp_tests)
-
-    if (SQLITECPP_BUILD_EXAMPLES)
-        # does the example1 runs successfully?
-        add_test(Example1Run SQLiteCpp_example1)
-    endif (SQLITECPP_BUILD_EXAMPLES)
-else (SQLITECPP_BUILD_TESTS)
-    message(STATUS "SQLITECPP_BUILD_TESTS OFF")
-endif (SQLITECPP_BUILD_TESTS)
+# Main CMake file for compiling the library itself, examples and tests.
+#
+# Copyright (c) 2012-2019 Sebastien Rombauts (sebastien.rombauts@gmail.com)
+#
+# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
+# or copy at http://opensource.org/licenses/MIT)
+cmake_minimum_required(VERSION 2.8.12) # first version with add_compile_options()
+project(SQLiteCpp)
+
+message (STATUS "CMake version: ${CMAKE_VERSION}")
+
+# Define useful variables to handle OS differences:
+if (WIN32)
+    set(DEV_NULL                "NUL")
+else (WIN32) # UNIX
+    set(DEV_NULL                "/dev/null")
+endif (WIN32)
+
+# then Compiler/IDE differences:
+if (MSVC)
+    set(CPPLINT_ARG_OUTPUT      "--output=vs7")
+    set(CPPCHECK_ARG_TEMPLATE   "--template=vs")
+    # disable Visual Studio warnings for fopen() used in the example
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    # Flags for linking with multithread static C++ runtime, required by googletest
+    if (SQLITECPP_BUILD_TESTS)
+        message(STATUS "Linking against multithread static C++ runtime for unit tests with googletest")
+        set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE} /MT")
+        set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG} /MTd")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+        set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+    endif (SQLITECPP_BUILD_TESTS)
+    # Handle the (partly supported) MSVC versions prior to 2015
+    if (MSVC_VERSION LESS 1900) # OR MSVC_TOOLSET_VERSION LESS 140)
+      message(WARNING "MSVC < 2015 detected: Visual Studio prior to 2015 is not fully supported. BLOB storage seems to be corrupted.")
+    endif (MSVC_VERSION LESS 1900)
+else (MSVC)
+    set(CPPLINT_ARG_OUTPUT      "--output=eclipse")
+    set(CPPCHECK_ARG_TEMPLATE   "--template=gcc")
+    # Useful compile flags and extra warnings
+    add_compile_options(-fstack-protector -Wall -Wextra -Wpedantic -Wno-long-long -Wswitch-enum -Wshadow -Winline)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++0x-compat") # C++ only
+    if (CMAKE_COMPILER_IS_GNUCXX)
+        # GCC flags
+        option(SQLITECPP_USE_GCOV "USE GCov instrumentation." OFF)
+        if (SQLITECPP_USE_GCOV)
+            message (STATUS "Using GCov instrumentation")
+            add_compile_options (-coverage) # NOTE -fkeep-inline-functions would be usefull but not working with current google test and gcc 4.8
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -coverage")
+        endif ()
+    endif (CMAKE_COMPILER_IS_GNUCXX)
+endif (MSVC)
+# and then common variables
+set(CPPLINT_ARG_VERBOSE "--verbose=3")
+set(CPPLINT_ARG_LINELENGTH "--linelength=120")
+
+# Print CXX compiler information
+message (STATUS "CMAKE_CXX_COMPILER '${CMAKE_CXX_COMPILER}' '${CMAKE_CXX_COMPILER_ID}' '${CMAKE_CXX_COMPILER_VERSION}'")
+
+# Print CXX FLAGS
+message (STATUS "CMAKE_CXX_FLAGS                '${CMAKE_CXX_FLAGS}'")
+if (MSVC)
+    message (STATUS "CMAKE_CXX_FLAGS_DEBUG          '${CMAKE_CXX_FLAGS_DEBUG}'")
+    message (STATUS "CMAKE_CXX_FLAGS_RELEASE        '${CMAKE_CXX_FLAGS_RELEASE}'")
+    message (STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO '${CMAKE_CXX_FLAGS_RELWITHDEBINFO}'")
+    message (STATUS "CMAKE_CXX_FLAGS_MINSIZEREL     '${CMAKE_CXX_FLAGS_MINSIZEREL}'")
+else (NOT MSVC)
+    if     (CMAKE_BUILD_TYPE STREQUAL Debug)
+        message (STATUS "CMAKE_CXX_FLAGS_DEBUG          '${CMAKE_CXX_FLAGS_DEBUG}'")
+    elseif (CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+        message (STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO '${CMAKE_CXX_FLAGS_RELWITHDEBINFO}'")
+    elseif (CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
+        message (STATUS "CMAKE_CXX_FLAGS_MINSIZEREL     '${CMAKE_CXX_FLAGS_MINSIZEREL}'")
+    else ()
+        message (STATUS "CMAKE_CXX_FLAGS_RELEASE        '${CMAKE_CXX_FLAGS_RELEASE}'")
+    endif ()
+endif ()
+
+# Options relative to SQLite and SQLiteC++ functions
+
+option(SQLITE_ENABLE_COLUMN_METADATA "Enable Column::getColumnOriginName(). Require support from sqlite3 library." ON)
+if (SQLITE_ENABLE_COLUMN_METADATA)
+    # Enable the use of SQLite column metadata and Column::getColumnOriginName() method,
+    # Require that the sqlite3 library is also compiled with this flag (default under Debian/Ubuntu, but not on Mac OS X).
+    add_definitions(-DSQLITE_ENABLE_COLUMN_METADATA)
+endif (SQLITE_ENABLE_COLUMN_METADATA)
+
+option(SQLITE_ENABLE_ASSERT_HANDLER "Enable the user defintion of a assertion_failed() handler." OFF)
+if (SQLITE_ENABLE_ASSERT_HANDLER)
+    # Enable the user defintion of a assertion_failed() handler (default to false, easier to handler for begginers).
+    add_definitions(-DSQLITECPP_ENABLE_ASSERT_HANDLER)
+endif (SQLITE_ENABLE_ASSERT_HANDLER)
+
+option(SQLITE_USE_LEGACY_STRUCT "Fallback to forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)" OFF)
+if (SQLITE_USE_LEGACY_STRUCT)
+    # Force forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)
+    add_definitions(-DSQLITE_USE_LEGACY_STRUCT)
+endif (SQLITE_USE_LEGACY_STRUCT)
+
+
+## Build the C++ Wrapper ##
+
+# adding a new file require explicittly modifing the CMakeLists.txt
+# so that CMake knows that it should rebuild the project (it is best practice)
+
+# list of sources files of the library
+set(SQLITECPP_SRC
+ ${PROJECT_SOURCE_DIR}/src/Backup.cpp
+ ${PROJECT_SOURCE_DIR}/src/Column.cpp
+ ${PROJECT_SOURCE_DIR}/src/Database.cpp
+ ${PROJECT_SOURCE_DIR}/src/Exception.cpp
+ ${PROJECT_SOURCE_DIR}/src/Statement.cpp
+ ${PROJECT_SOURCE_DIR}/src/Transaction.cpp
+)
+source_group(src FILES ${SQLITECPP_SRC})
+
+# list of header files of the library
+set(SQLITECPP_INC
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/SQLiteCpp.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Assertion.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Backup.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Column.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Database.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Exception.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Statement.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Transaction.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/Utils.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/VariadicBind.h
+ ${PROJECT_SOURCE_DIR}/include/SQLiteCpp/ExecuteMany.h
+)
+source_group(include FILES ${SQLITECPP_INC})
+
+# list of test files of the library
+set(SQLITECPP_TESTS
+ tests/Column_test.cpp
+ tests/Database_test.cpp
+ tests/Statement_test.cpp
+ tests/Backup_test.cpp
+ tests/Transaction_test.cpp
+ tests/VariadicBind_test.cpp
+ tests/Exception_test.cpp
+ tests/ExecuteMany_test.cpp
+)
+source_group(tests FILES ${SQLITECPP_TESTS})
+
+# list of example files of the library
+set(SQLITECPP_EXAMPLES
+ examples/example1/main.cpp
+)
+source_group(example1 FILES ${SQLITECPP_EXAMPLES})
+
+# list of doc files of the library
+set(SQLITECPP_DOC
+ README.md
+ LICENSE.txt
+ CHANGELOG.md
+ TODO.txt
+)
+source_group(doc FILES ${SQLITECPP_DOC})
+
+# list of script files of the library
+set(SQLITECPP_SCRIPT
+ .travis.yml
+ appveyor.yml
+ build.bat
+ build.sh
+ cpplint.py
+ Doxyfile
+ FindSQLiteCpp.cmake
+)
+source_group(scripts FILES ${SQLITECPP_SCRIPT})
+
+# All includes are relative to the "include" directory
+include_directories("${PROJECT_SOURCE_DIR}/include")
+
+# add sources of the wrapper as a "SQLiteCpp" static library
+add_library(SQLiteCpp ${SQLITECPP_SRC} ${SQLITECPP_INC} ${SQLITECPP_DOC} ${SQLITECPP_SCRIPT})
+# make the sqlite3 library part of the interface of the SQLiteCpp wrapper itself (the client app does not need to link to sqlite3)
+# PR https://github.com/SRombauts/SQLiteCpp/pull/111 "linked SQLiteCpp to sqlite3" commented out since it breaks install step from PR #118
+#target_link_libraries(SQLiteCpp PUBLIC sqlite3)
+
+if (UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
+    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-fPIC")
+endif (UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
+
+# Allow the library to be installed via "make install" and found with "find_package"
+install(TARGETS SQLiteCpp
+    EXPORT ${PROJECT_NAME}Config
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    COMPONENT libraries)
+target_include_directories(SQLiteCpp PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include/>)
+install(DIRECTORY include/ DESTINATION include COMPONENT headers FILES_MATCHING REGEX ".*\\.(hpp|h)$")
+install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
+
+## Build provided copy of SQLite3 C library ##
+
+# TODO 
+#find_package(sqlite3)
+#if(sqlite3_VERSION VERSION_LESS "3.19")
+#    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
+#endif()
+
+option(SQLITECPP_USE_ASAN "Use Address Sanitizer." OFF)
+if (SQLITECPP_USE_ASAN)
+    if ((CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 6) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
+        message (STATUS "Using Address Sanitizer")
+        set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+        if (CMAKE_COMPILER_IS_GNUCXX)
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
+        endif ()
+    endif ()
+endif (SQLITECPP_USE_ASAN)
+
+option(SQLITECPP_INTERNAL_SQLITE "Add the internal SQLite3 source to the project." ON)
+if (SQLITECPP_INTERNAL_SQLITE)
+    # build the SQLite3 C library (for ease of use/compatibility) versus Linux sqlite3-dev package
+    add_subdirectory(sqlite3)
+    target_include_directories(sqlite3 PUBLIC "${PROJECT_SOURCE_DIR}/sqlite3")
+    target_include_directories(SQLiteCpp PRIVATE "${PROJECT_SOURCE_DIR}/sqlite3")
+endif (SQLITECPP_INTERNAL_SQLITE)
+
+# Optional additional targets:
+
+option(SQLITECPP_RUN_CPPLINT "Run cpplint.py tool for Google C++ StyleGuide." ON)
+if (SQLITECPP_RUN_CPPLINT)
+    find_package(PythonInterp)
+    if (PYTHONINTERP_FOUND)
+        # add a cpplint target to the "all" target
+        add_custom_target(SQLiteCpp_cpplint
+         ALL
+         COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
+        )
+    endif (PYTHONINTERP_FOUND)
+else (SQLITECPP_RUN_CPPLINT)
+    message(STATUS "SQLITECPP_RUN_CPPLINT OFF")
+endif (SQLITECPP_RUN_CPPLINT)
+
+option(SQLITECPP_RUN_CPPCHECK "Run cppcheck C++ static analysis tool." ON)
+if (SQLITECPP_RUN_CPPCHECK)
+    find_program(CPPCHECK_EXECUTABLE NAMES cppcheck)
+    if (CPPCHECK_EXECUTABLE)
+        # add a cppcheck target to the "all" target
+        add_custom_target(SQLiteCpp_cppcheck
+         ALL
+         COMMAND ${CPPCHECK_EXECUTABLE} -j 8 cppcheck --enable=style --quiet ${CPPCHECK_ARG_TEMPLATE} ${PROJECT_SOURCE_DIR}/src
+        )
+        execute_process(COMMAND "${CPPCHECK_EXECUTABLE}" --version OUTPUT_VARIABLE CPPCHECK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+        message(STATUS "Found Cppcheck: ${CPPCHECK_EXECUTABLE} ${CPPCHECK_VERSION}")
+    else (CPPCHECK_EXECUTABLE)
+        message(STATUS "Could NOT find cppcheck")
+    endif (CPPCHECK_EXECUTABLE)
+else (SQLITECPP_RUN_CPPCHECK)
+    message(STATUS "SQLITECPP_RUN_CPPCHECK OFF")
+endif (SQLITECPP_RUN_CPPCHECK)
+
+option(SQLITECPP_RUN_DOXYGEN "Run Doxygen C++ documentation tool." OFF)
+if (SQLITECPP_RUN_DOXYGEN)
+    find_package(Doxygen)
+    if (DOXYGEN_FOUND)
+        # add a Doxygen target to the "all" target
+        add_custom_target(SQLiteCpp_doxygen
+         ALL
+         COMMAND doxygen Doxyfile > ${DEV_NULL}
+         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        )
+    endif (DOXYGEN_FOUND)
+else (SQLITECPP_RUN_DOXYGEN)
+    message(STATUS "SQLITECPP_RUN_DOXYGEN OFF")
+endif (SQLITECPP_RUN_DOXYGEN)
+
+option(SQLITECPP_BUILD_EXAMPLES "Build examples." OFF)
+if (SQLITECPP_BUILD_EXAMPLES)
+    # add the basic example executable
+    add_executable(SQLiteCpp_example1 ${SQLITECPP_EXAMPLES})
+    target_link_libraries(SQLiteCpp_example1 SQLiteCpp sqlite3)
+    # Link target with pthread and dl for linux
+    if (UNIX)
+        target_link_libraries(SQLiteCpp_example1 pthread)
+        if (NOT APPLE)
+            target_link_libraries(SQLiteCpp_example1 dl)
+        endif ()
+    elseif (MSYS OR MINGW)
+        target_link_libraries(SQLiteCpp_example1 ssp)
+    endif ()
+else (SQLITECPP_BUILD_EXAMPLES)
+    message(STATUS "SQLITECPP_BUILD_EXAMPLES OFF")
+endif (SQLITECPP_BUILD_EXAMPLES)
+
+option(SQLITECPP_BUILD_TESTS "Build and run tests." OFF)
+if (SQLITECPP_BUILD_TESTS)
+    # deactivate some warnings for compiling the gtest library
+    if (NOT MSVC)
+        add_compile_options(-Wno-variadic-macros -Wno-long-long -Wno-switch-enum -Wno-float-equal -Wno-conversion-null -Wno-switch-default -Wno-pedantic)
+    endif (NOT MSVC)
+
+    # add the subdirectory containing the CMakeLists.txt for the gtest library
+    # TODO: under Linux, uses libgtest-dev if found
+    if (NOT EXISTS "${PROJECT_SOURCE_DIR}/googletest/CMakeLists.txt")
+        message(FATAL_ERROR "Missing 'googletest' submodule! Either use 'git submodule init' and 'git submodule update' to get googletest according to the README, or deactivate unit tests with -DSQLITECPP_BUILD_TESTS=OFF")
+    endif ()
+    add_subdirectory(googletest)
+    include_directories("${PROJECT_SOURCE_DIR}/googletest/googletest/include")
+
+    # Add definitions to keep googletest from making the compilation fail
+    if (MSVC)
+        if (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141)
+            target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+            target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+            target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+            target_compile_definitions(gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+        endif (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919)
+    endif (MSVC)
+
+    # add the unit test executable
+    add_executable(SQLiteCpp_tests ${SQLITECPP_TESTS})
+    target_link_libraries(SQLiteCpp_tests gtest_main SQLiteCpp sqlite3)
+    # Link target with dl for linux
+    if (UNIX AND NOT APPLE)
+        target_link_libraries(SQLiteCpp_tests dl)
+    endif ()
+
+    # add a "test" target:
+    enable_testing()
+
+    # does the tests pass?
+    add_test(UnitTests SQLiteCpp_tests)
+
+    if (SQLITECPP_BUILD_EXAMPLES)
+        # does the example1 runs successfully?
+        add_test(Example1Run SQLiteCpp_example1)
+    endif (SQLITECPP_BUILD_EXAMPLES)
+else (SQLITECPP_BUILD_TESTS)
+    message(STATUS "SQLITECPP_BUILD_TESTS OFF")
+endif (SQLITECPP_BUILD_TESTS)

thirdparty/SQLiteCpp/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.14
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ RM = /usr/bin/cmake -E remove -f
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/massive/dev/Parkmanne
+CMAKE_SOURCE_DIR = /home/pyrostefan/Documents/Parkmanne/Parkmanne
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/massive/dev/Parkmanne
+CMAKE_BINARY_DIR = /home/pyrostefan/Documents/Parkmanne/Parkmanne
 
 #=============================================================================
 # Targets provided globally by CMake.
@@ -82,8 +82,8 @@ install/local/fast: preinstall/fast
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+	/usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -94,7 +94,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -126,14 +126,14 @@ install/fast: preinstall/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -E cmake_progress_start /home/massive/dev/Parkmanne/CMakeFiles /home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/progress.marks
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/massive/dev/Parkmanne/CMakeFiles 0
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -E cmake_progress_start /home/pyrostefan/Documents/Parkmanne/Parkmanne/CMakeFiles /home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/progress.marks
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/pyrostefan/Documents/Parkmanne/Parkmanne/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/clean
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/clean
 .PHONY : clean
 
 # The main clean target
@@ -143,22 +143,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/preinstall
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/preinstall
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/rule:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/rule
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/rule
 .PHONY : thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/rule
 
 # Convenience name for target.
@@ -168,12 +168,12 @@ SQLiteCpp_cpplint: thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/rule
 
 # fast build rule for target.
 SQLiteCpp_cpplint/fast:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/build
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp_cpplint.dir/build
 .PHONY : SQLiteCpp_cpplint/fast
 
 # Convenience name for target.
 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/rule:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/rule
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/rule
 .PHONY : thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/rule
 
 # Convenience name for target.
@@ -183,7 +183,7 @@ SQLiteCpp: thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/rule
 
 # fast build rule for target.
 SQLiteCpp/fast:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build
 .PHONY : SQLiteCpp/fast
 
 src/Backup.o: src/Backup.cpp.o
@@ -192,7 +192,7 @@ src/Backup.o: src/Backup.cpp.o
 
 # target to build an object file
 src/Backup.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.o
 .PHONY : src/Backup.cpp.o
 
 src/Backup.i: src/Backup.cpp.i
@@ -201,7 +201,7 @@ src/Backup.i: src/Backup.cpp.i
 
 # target to preprocess a source file
 src/Backup.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.i
 .PHONY : src/Backup.cpp.i
 
 src/Backup.s: src/Backup.cpp.s
@@ -210,7 +210,7 @@ src/Backup.s: src/Backup.cpp.s
 
 # target to generate assembly for a file
 src/Backup.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.s
 .PHONY : src/Backup.cpp.s
 
 src/Column.o: src/Column.cpp.o
@@ -219,7 +219,7 @@ src/Column.o: src/Column.cpp.o
 
 # target to build an object file
 src/Column.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.o
 .PHONY : src/Column.cpp.o
 
 src/Column.i: src/Column.cpp.i
@@ -228,7 +228,7 @@ src/Column.i: src/Column.cpp.i
 
 # target to preprocess a source file
 src/Column.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.i
 .PHONY : src/Column.cpp.i
 
 src/Column.s: src/Column.cpp.s
@@ -237,7 +237,7 @@ src/Column.s: src/Column.cpp.s
 
 # target to generate assembly for a file
 src/Column.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Column.cpp.s
 .PHONY : src/Column.cpp.s
 
 src/Database.o: src/Database.cpp.o
@@ -246,7 +246,7 @@ src/Database.o: src/Database.cpp.o
 
 # target to build an object file
 src/Database.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.o
 .PHONY : src/Database.cpp.o
 
 src/Database.i: src/Database.cpp.i
@@ -255,7 +255,7 @@ src/Database.i: src/Database.cpp.i
 
 # target to preprocess a source file
 src/Database.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.i
 .PHONY : src/Database.cpp.i
 
 src/Database.s: src/Database.cpp.s
@@ -264,7 +264,7 @@ src/Database.s: src/Database.cpp.s
 
 # target to generate assembly for a file
 src/Database.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Database.cpp.s
 .PHONY : src/Database.cpp.s
 
 src/Exception.o: src/Exception.cpp.o
@@ -273,7 +273,7 @@ src/Exception.o: src/Exception.cpp.o
 
 # target to build an object file
 src/Exception.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.o
 .PHONY : src/Exception.cpp.o
 
 src/Exception.i: src/Exception.cpp.i
@@ -282,7 +282,7 @@ src/Exception.i: src/Exception.cpp.i
 
 # target to preprocess a source file
 src/Exception.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.i
 .PHONY : src/Exception.cpp.i
 
 src/Exception.s: src/Exception.cpp.s
@@ -291,7 +291,7 @@ src/Exception.s: src/Exception.cpp.s
 
 # target to generate assembly for a file
 src/Exception.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Exception.cpp.s
 .PHONY : src/Exception.cpp.s
 
 src/Statement.o: src/Statement.cpp.o
@@ -300,7 +300,7 @@ src/Statement.o: src/Statement.cpp.o
 
 # target to build an object file
 src/Statement.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.o
 .PHONY : src/Statement.cpp.o
 
 src/Statement.i: src/Statement.cpp.i
@@ -309,7 +309,7 @@ src/Statement.i: src/Statement.cpp.i
 
 # target to preprocess a source file
 src/Statement.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.i
 .PHONY : src/Statement.cpp.i
 
 src/Statement.s: src/Statement.cpp.s
@@ -318,7 +318,7 @@ src/Statement.s: src/Statement.cpp.s
 
 # target to generate assembly for a file
 src/Statement.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Statement.cpp.s
 .PHONY : src/Statement.cpp.s
 
 src/Transaction.o: src/Transaction.cpp.o
@@ -327,7 +327,7 @@ src/Transaction.o: src/Transaction.cpp.o
 
 # target to build an object file
 src/Transaction.cpp.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.o
 .PHONY : src/Transaction.cpp.o
 
 src/Transaction.i: src/Transaction.cpp.i
@@ -336,7 +336,7 @@ src/Transaction.i: src/Transaction.cpp.i
 
 # target to preprocess a source file
 src/Transaction.cpp.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.i
 .PHONY : src/Transaction.cpp.i
 
 src/Transaction.s: src/Transaction.cpp.s
@@ -345,7 +345,7 @@ src/Transaction.s: src/Transaction.cpp.s
 
 # target to generate assembly for a file
 src/Transaction.cpp.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/build.make thirdparty/SQLiteCpp/CMakeFiles/SQLiteCpp.dir/src/Transaction.cpp.s
 .PHONY : src/Transaction.cpp.s
 
 # Help Target
@@ -391,6 +391,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 

thirdparty/SQLiteCpp/cmake_install.cmake

@@ -1,4 +1,4 @@
-# Install script for directory: /home/massive/dev/Parkmanne/thirdparty/SQLiteCpp
+# Install script for directory: /home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp
 
 # Set the install prefix
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -29,7 +29,7 @@ endif()
 
 # Install shared libraries without execute permission?
 if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  set(CMAKE_INSTALL_SO_NO_EXE "0")
+  set(CMAKE_INSTALL_SO_NO_EXE "1")
 endif()
 
 # Is this installation the result of a crosscompile?
@@ -38,18 +38,18 @@ if(NOT DEFINED CMAKE_CROSSCOMPILING)
 endif()
 
 if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xlibrariesx" OR NOT CMAKE_INSTALL_COMPONENT)
-  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/libSQLiteCpp.a")
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/libSQLiteCpp.a")
 endif()
 
 if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xheadersx" OR NOT CMAKE_INSTALL_COMPONENT)
-  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE DIRECTORY FILES "/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/include/" FILES_MATCHING REGEX ".*\\.(hpp|h)$")
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE DIRECTORY FILES "/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/include/" FILES_MATCHING REGEX ".*\\.(hpp|h)$")
 endif()
 
 if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
   if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake")
     file(DIFFERENT EXPORT_FILE_CHANGED FILES
          "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake"
-         "/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake")
+         "/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake")
     if(EXPORT_FILE_CHANGED)
       file(GLOB OLD_CONFIG_FILES "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp/SQLiteCppConfig-*.cmake")
       if(OLD_CONFIG_FILES)
@@ -58,15 +58,15 @@ if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_
       endif()
     endif()
   endif()
-  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp" TYPE FILE FILES "/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake")
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp" TYPE FILE FILES "/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig.cmake")
   if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^()$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp" TYPE FILE FILES "/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig-noconfig.cmake")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/SQLiteCpp" TYPE FILE FILES "/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/CMakeFiles/Export/lib/cmake/SQLiteCpp/SQLiteCppConfig-noconfig.cmake")
   endif()
 endif()
 
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)
   # Include the install script for each subdirectory.
-  include("/home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/sqlite3/cmake_install.cmake")
+  include("/home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/sqlite3/cmake_install.cmake")
 
 endif()
 

thirdparty/SQLiteCpp/sqlite3/Makefile

@@ -1,5 +1,5 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.14
+# Generated by "Unix Makefiles" Generator, CMake Version 3.10
 
 # Default target executed when no arguments are given to make.
 default_target: all
@@ -48,10 +48,10 @@ RM = /usr/bin/cmake -E remove -f
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/massive/dev/Parkmanne
+CMAKE_SOURCE_DIR = /home/pyrostefan/Documents/Parkmanne/Parkmanne
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/massive/dev/Parkmanne
+CMAKE_BINARY_DIR = /home/pyrostefan/Documents/Parkmanne/Parkmanne
 
 #=============================================================================
 # Targets provided globally by CMake.
@@ -70,8 +70,8 @@ install/strip/fast: preinstall/fast
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+	/usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -82,7 +82,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -126,14 +126,14 @@ install/fast: preinstall/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -E cmake_progress_start /home/massive/dev/Parkmanne/CMakeFiles /home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/sqlite3/CMakeFiles/progress.marks
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/massive/dev/Parkmanne/CMakeFiles 0
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -E cmake_progress_start /home/pyrostefan/Documents/Parkmanne/Parkmanne/CMakeFiles /home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/sqlite3/CMakeFiles/progress.marks
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/pyrostefan/Documents/Parkmanne/Parkmanne/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/clean
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/clean
 .PHONY : clean
 
 # The main clean target
@@ -143,22 +143,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/preinstall
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/preinstall
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/rule:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/rule
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f CMakeFiles/Makefile2 thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/rule
 .PHONY : thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/rule
 
 # Convenience name for target.
@@ -168,7 +168,7 @@ sqlite3: thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/rule
 
 # fast build rule for target.
 sqlite3/fast:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build
 .PHONY : sqlite3/fast
 
 sqlite3.o: sqlite3.c.o
@@ -177,7 +177,7 @@ sqlite3.o: sqlite3.c.o
 
 # target to build an object file
 sqlite3.c.o:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.o
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.o
 .PHONY : sqlite3.c.o
 
 sqlite3.i: sqlite3.c.i
@@ -186,7 +186,7 @@ sqlite3.i: sqlite3.c.i
 
 # target to preprocess a source file
 sqlite3.c.i:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.i
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.i
 .PHONY : sqlite3.c.i
 
 sqlite3.s: sqlite3.c.s
@@ -195,7 +195,7 @@ sqlite3.s: sqlite3.c.s
 
 # target to generate assembly for a file
 sqlite3.c.s:
-	cd /home/massive/dev/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.s
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(MAKE) -f thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make thirdparty/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/sqlite3.c.s
 .PHONY : sqlite3.c.s
 
 # Help Target
@@ -225,6 +225,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /home/massive/dev/Parkmanne && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/pyrostefan/Documents/Parkmanne/Parkmanne && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 

thirdparty/SQLiteCpp/sqlite3/cmake_install.cmake

@@ -1,4 +1,4 @@
-# Install script for directory: /home/massive/dev/Parkmanne/thirdparty/SQLiteCpp/sqlite3
+# Install script for directory: /home/pyrostefan/Documents/Parkmanne/Parkmanne/thirdparty/SQLiteCpp/sqlite3
 
 # Set the install prefix
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -29,7 +29,7 @@ endif()
 
 # Install shared libraries without execute permission?
 if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  set(CMAKE_INSTALL_SO_NO_EXE "0")
+  set(CMAKE_INSTALL_SO_NO_EXE "1")
 endif()
 
 # Is this installation the result of a crosscompile?

thirdparty/SQLiteCpp/src/Backup.cpp

@@ -10,95 +10,78 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Backup.h>
-
 #include <SQLiteCpp/Exception.h>
-
 #include <sqlite3.h>
-
-namespace SQLite
-{
-
+namespace SQLite {
 // Initialize resource for SQLite database backup
-Backup::Backup(Database&    aDestDatabase,
-               const char*  apDestDatabaseName,
-               Database&    aSrcDatabase,
-               const char*  apSrcDatabaseName) :
-    mpSQLiteBackup(NULL)
+Backup::Backup(Database& aDestDatabase,
+    const char* apDestDatabaseName,
+    Database& aSrcDatabase,
+    const char* apSrcDatabaseName)
+    : mpSQLiteBackup(NULL)
 {
     mpSQLiteBackup = sqlite3_backup_init(aDestDatabase.getHandle(),
-                                         apDestDatabaseName,
-                                         aSrcDatabase.getHandle(),
-                                         apSrcDatabaseName);
-    if (NULL == mpSQLiteBackup)
-    {
+        apDestDatabaseName,
+        aSrcDatabase.getHandle(),
+        apSrcDatabaseName);
+    if (NULL == mpSQLiteBackup) {
         // If an error occurs, the error code and message are attached to the destination database connection.
         throw SQLite::Exception(aDestDatabase.getHandle());
     }
 }
-
 // Initialize resource for SQLite database backup
-Backup::Backup(Database&            aDestDatabase,
-               const std::string&   aDestDatabaseName,
-               Database&            aSrcDatabase,
-               const std::string&   aSrcDatabaseName) :
-    mpSQLiteBackup(NULL)
+Backup::Backup(Database& aDestDatabase,
+    const std::string& aDestDatabaseName,
+    Database& aSrcDatabase,
+    const std::string& aSrcDatabaseName)
+    : mpSQLiteBackup(NULL)
 {
     mpSQLiteBackup = sqlite3_backup_init(aDestDatabase.getHandle(),
-                                         aDestDatabaseName.c_str(),
-                                         aSrcDatabase.getHandle(),
-                                         aSrcDatabaseName.c_str());
-    if (NULL == mpSQLiteBackup)
-    {
+        aDestDatabaseName.c_str(),
+        aSrcDatabase.getHandle(),
+        aSrcDatabaseName.c_str());
+    if (NULL == mpSQLiteBackup) {
         // If an error occurs, the error code and message are attached to the destination database connection.
         throw SQLite::Exception(aDestDatabase.getHandle());
     }
 }
-
 // Initialize resource for SQLite database backup
-Backup::Backup(Database &aDestDatabase, Database &aSrcDatabase) :
-    mpSQLiteBackup(NULL)
+Backup::Backup(Database& aDestDatabase, Database& aSrcDatabase)
+    : mpSQLiteBackup(NULL)
 {
     mpSQLiteBackup = sqlite3_backup_init(aDestDatabase.getHandle(),
-                                         "main",
-                                         aSrcDatabase.getHandle(),
-                                         "main");
-    if (NULL == mpSQLiteBackup)
-    {
+        "main",
+        aSrcDatabase.getHandle(),
+        "main");
+    if (NULL == mpSQLiteBackup) {
         // If an error occurs, the error code and message are attached to the destination database connection.
         throw SQLite::Exception(aDestDatabase.getHandle());
     }
 }
-
 // Release resource for SQLite database backup
 Backup::~Backup()
 {
-    if (NULL != mpSQLiteBackup)
-    {
+    if (NULL != mpSQLiteBackup) {
         sqlite3_backup_finish(mpSQLiteBackup);
     }
 }
-
 // Execute backup step with a given number of source pages to be copied
 int Backup::executeStep(const int aNumPage /* = -1 */)
 {
     const int res = sqlite3_backup_step(mpSQLiteBackup, aNumPage);
-    if (SQLITE_OK != res && SQLITE_DONE != res && SQLITE_BUSY != res && SQLITE_LOCKED != res)
-    {
+    if (SQLITE_OK != res && SQLITE_DONE != res && SQLITE_BUSY != res && SQLITE_LOCKED != res) {
         throw SQLite::Exception(sqlite3_errstr(res), res);
     }
     return res;
 }
-
 // Get the number of remaining source pages to be copied in this backup process
 int Backup::getRemainingPageCount()
 {
     return sqlite3_backup_remaining(mpSQLiteBackup);
 }
-
 // Get the number of total source pages to be copied in this backup process
 int Backup::getTotalPageCount()
 {
     return sqlite3_backup_pagecount(mpSQLiteBackup);
 }
-
-}  // namespace SQLite
+} // namespace SQLite

thirdparty/SQLiteCpp/src/Column.cpp

@@ -9,41 +9,33 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Column.h>
-
 #include <sqlite3.h>
-
 #include <iostream>
-
-
 namespace SQLite
 {
-
-const int INTEGER   = SQLITE_INTEGER;
-const int FLOAT     = SQLITE_FLOAT;
-const int TEXT      = SQLITE_TEXT;
-const int BLOB      = SQLITE_BLOB;
-const int Null      = SQLITE_NULL;
-
-
+const int INTEGER = SQLITE_INTEGER;
+const int FLOAT = SQLITE_FLOAT;
+const int TEXT = SQLITE_TEXT;
+const int BLOB = SQLITE_BLOB;
+const int Null = SQLITE_NULL;
 // Encapsulation of a Column in a row of the result pointed by the prepared Statement.
-Column::Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept : // nothrow
-    mStmtPtr(aStmtPtr),
+Column::Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept
+    : // nothrow
+    mStmtPtr(aStmtPtr)
+    ,
     mIndex(aIndex)
 {
 }
-
 // Finalize and unregister the SQL query from the SQLite Database Connection.
 Column::~Column()
 {
     // the finalization will be done by the destructor of the last shared pointer
 }
-
 // Return the named assigned to this result column (potentially aliased)
 const char* Column::getName() const noexcept // nothrow
 {
     return sqlite3_column_name(mStmtPtr, mIndex);
 }
-
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
 // Return the name of the table column that is the origin of this result column
 const char* Column::getOriginName() const noexcept // nothrow
@@ -51,74 +43,61 @@ const char* Column::getOriginName() const noexcept // nothrow
     return sqlite3_column_origin_name(mStmtPtr, mIndex);
 }
 #endif
-
 // Return the integer value of the column specified by its index starting at 0
 int Column::getInt() const noexcept // nothrow
 {
     return sqlite3_column_int(mStmtPtr, mIndex);
 }
-
 // Return the unsigned integer value of the column specified by its index starting at 0
 unsigned Column::getUInt() const noexcept // nothrow
 {
     return static_cast<unsigned>(getInt64());
 }
-
 // Return the 64bits integer value of the column specified by its index starting at 0
 long long Column::getInt64() const noexcept // nothrow
 {
     return sqlite3_column_int64(mStmtPtr, mIndex);
 }
-
 // Return the double value of the column specified by its index starting at 0
 double Column::getDouble() const noexcept // nothrow
 {
     return sqlite3_column_double(mStmtPtr, mIndex);
 }
-
 // Return a pointer to the text value (NULL terminated string) of the column specified by its index starting at 0
 const char* Column::getText(const char* apDefaultValue /* = "" */) const noexcept // nothrow
 {
     const char* pText = reinterpret_cast<const char*>(sqlite3_column_text(mStmtPtr, mIndex));
-    return (pText?pText:apDefaultValue);
+    return (pText ? pText : apDefaultValue);
 }
-
 // Return a pointer to the blob value (*not* NULL terminated) of the column specified by its index starting at 0
 const void* Column::getBlob() const noexcept // nothrow
 {
     return sqlite3_column_blob(mStmtPtr, mIndex);
 }
-
 // Return a std::string to a TEXT or BLOB column
 std::string Column::getString() const
 {
     // Note: using sqlite3_column_blob and not sqlite3_column_text
     // - no need for sqlite3_column_text to add a \0 on the end, as we're getting the bytes length directly
-    const char *data = static_cast<const char *>(sqlite3_column_blob(mStmtPtr, mIndex));
-
+    const char* data = static_cast<const char*>(sqlite3_column_blob(mStmtPtr, mIndex));
     // SQLite docs: "The safest policy is to invoke… sqlite3_column_blob() followed by sqlite3_column_bytes()"
     // Note: std::string is ok to pass nullptr as first arg, if length is 0
     return std::string(data, sqlite3_column_bytes(mStmtPtr, mIndex));
 }
-
 // Return the type of the value of the column
 int Column::getType() const noexcept // nothrow
 {
     return sqlite3_column_type(mStmtPtr, mIndex);
 }
-
 // Return the number of bytes used by the text value of the column
 int Column::getBytes() const noexcept // nothrow
 {
     return sqlite3_column_bytes(mStmtPtr, mIndex);
 }
-
 // Standard std::ostream inserter
 std::ostream& operator<<(std::ostream& aStream, const Column& aColumn)
 {
     aStream.write(aColumn.getText(), aColumn.getBytes());
     return aStream;
 }
-
-
-}  // namespace SQLite
+} // namespace SQLite

thirdparty/SQLiteCpp/src/Database.cpp

@@ -9,52 +9,42 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Database.h>
-
 #include <SQLiteCpp/Statement.h>
 #include <SQLiteCpp/Assertion.h>
 #include <SQLiteCpp/Exception.h>
-
 #include <sqlite3.h>
 #include <fstream>
 #include <string.h>
-
 #ifndef SQLITE_DETERMINISTIC
 #define SQLITE_DETERMINISTIC 0x800
 #endif // SQLITE_DETERMINISTIC
-
-
 namespace SQLite
 {
-
-const int   OPEN_READONLY   = SQLITE_OPEN_READONLY;
-const int   OPEN_READWRITE  = SQLITE_OPEN_READWRITE;
-const int   OPEN_CREATE     = SQLITE_OPEN_CREATE;
-const int   OPEN_URI        = SQLITE_OPEN_URI;
-
-const int   OK              = SQLITE_OK;
-
-const char* VERSION         = SQLITE_VERSION;
-const int   VERSION_NUMBER  = SQLITE_VERSION_NUMBER;
-
+const int OPEN_READONLY = SQLITE_OPEN_READONLY;
+const int OPEN_READWRITE = SQLITE_OPEN_READWRITE;
+const int OPEN_CREATE = SQLITE_OPEN_CREATE;
+const int OPEN_URI = SQLITE_OPEN_URI;
+const int OK = SQLITE_OK;
+const char* VERSION = SQLITE_VERSION;
+const int VERSION_NUMBER = SQLITE_VERSION_NUMBER;
 // Return SQLite version string using runtime call to the compiled library
 const char* getLibVersion() noexcept // nothrow
 {
     return sqlite3_libversion();
 }
-
 // Return SQLite version number using runtime call to the compiled library
 int getLibVersionNumber() noexcept // nothrow
 {
     return sqlite3_libversion_number();
 }
-
-
 // Open the provided database UTF-8 filename with SQLite::OPEN_xxx provided flags.
 Database::Database(const char* apFilename,
-                   const int   aFlags         /* = SQLite::OPEN_READONLY*/,
-                   const int   aBusyTimeoutMs /* = 0 */,
-                   const char* apVfs          /* = nullptr*/) :
-    mpSQLite(nullptr),
+    const int aFlags /* = SQLite::OPEN_READONLY*/,
+    const int aBusyTimeoutMs /* = 0 */,
+    const char* apVfs /* = nullptr*/)
+    :
+    mpSQLite(nullptr)
+    ,
     mFilename(apFilename)
 {
     const int ret = sqlite3_open_v2(apFilename, &mpSQLite, aFlags, apVfs);
@@ -69,13 +59,14 @@ Database::Database(const char* apFilename,
         setBusyTimeout(aBusyTimeoutMs);
     }
 }
-
 // Open the provided database UTF-8 filename with SQLite::OPEN_xxx provided flags.
 Database::Database(const std::string& aFilename,
-                   const int          aFlags         /* = SQLite::OPEN_READONLY*/,
-                   const int          aBusyTimeoutMs /* = 0 */,
-                   const std::string& aVfs           /* = "" */) :
-    mpSQLite(nullptr),
+    const int aFlags /* = SQLite::OPEN_READONLY*/,
+    const int aBusyTimeoutMs /* = 0 */,
+    const std::string& aVfs /* = "" */)
+    :
+    mpSQLite(nullptr)
+    ,
     mFilename(aFilename)
 {
     const int ret = sqlite3_open_v2(aFilename.c_str(), &mpSQLite, aFlags, aVfs.empty() ? nullptr : aVfs.c_str());
@@ -90,20 +81,16 @@ Database::Database(const std::string& aFilename,
         setBusyTimeout(aBusyTimeoutMs);
     }
 }
-
 // Close the SQLite database connection.
 Database::~Database()
 {
     const int ret = sqlite3_close(mpSQLite);
-
     // Avoid unreferenced variable warning when build in release mode
-    (void) ret;
-
+    (void)ret;
     // Only case of error is SQLITE_BUSY: "database is locked" (some statements are not finalized)
     // Never throw an exception in a destructor :
-    SQLITECPP_ASSERT(SQLITE_OK == ret, "database is locked");  // See SQLITECPP_ENABLE_ASSERT_HANDLER
+    SQLITECPP_ASSERT(SQLITE_OK == ret, "database is locked"); // See SQLITECPP_ENABLE_ASSERT_HANDLER
 }
-
 /**
  * @brief Set a busy handler that sleeps for a specified amount of time when a table is locked.
  *
@@ -122,17 +109,14 @@ void Database::setBusyTimeout(const int aBusyTimeoutMs)
     const int ret = sqlite3_busy_timeout(mpSQLite, aBusyTimeoutMs);
     check(ret);
 }
-
 // Shortcut to execute one or multiple SQL statements without results (UPDATE, INSERT, ALTER, COMMIT, CREATE...).
 int Database::exec(const char* apQueries)
 {
     const int ret = sqlite3_exec(mpSQLite, apQueries, nullptr, nullptr, nullptr);
     check(ret);
-
     // Return the number of rows modified by those SQL statements (INSERT, UPDATE or DELETE only)
     return sqlite3_changes(mpSQLite);
 }
-
 // Shortcut to execute a one step query and fetch the first column of the result.
 // WARNING: Be very careful with this dangerous method: you have to
 // make a COPY OF THE result, else it will be destroy before the next line
@@ -145,7 +129,6 @@ Column Database::execAndGet(const char* apQuery)
     (void)query.executeStep(); // Can return false if no result, which will throw next line in getColumn()
     return query.getColumn(0);
 }
-
 // Shortcut to test if a table exists.
 bool Database::tableExists(const char* apTableName)
 {
@@ -154,68 +137,60 @@ bool Database::tableExists(const char* apTableName)
     (void)query.executeStep(); // Cannot return false, as the above query always return a result
     return (1 == query.getColumn(0).getInt());
 }
-
 // Get the rowid of the most recent successful INSERT into the database from the current connection.
 long long Database::getLastInsertRowid() const noexcept // nothrow
 {
     return sqlite3_last_insert_rowid(mpSQLite);
 }
-
 // Get total number of rows modified by all INSERT, UPDATE or DELETE statement since connection.
 int Database::getTotalChanges() const noexcept // nothrow
 {
     return sqlite3_total_changes(mpSQLite);
 }
-
 // Return the numeric result code for the most recent failed API call (if any).
 int Database::getErrorCode() const noexcept // nothrow
 {
     return sqlite3_errcode(mpSQLite);
 }
-
 // Return the extended numeric result code for the most recent failed API call (if any).
 int Database::getExtendedErrorCode() const noexcept // nothrow
 {
     return sqlite3_extended_errcode(mpSQLite);
 }
-
 // Return UTF-8 encoded English language explanation of the most recent failed API call (if any).
 const char* Database::getErrorMsg() const noexcept // nothrow
 {
     return sqlite3_errmsg(mpSQLite);
 }
-
 // Attach a custom function to your sqlite database. Assumes UTF8 text representation.
 // Parameter details can be found here: http://www.sqlite.org/c3ref/create_function.html
-void Database::createFunction(const char*   apFuncName,
-                              int           aNbArg,
-                              bool          abDeterministic,
-                              void*         apApp,
-                              void        (*apFunc)(sqlite3_context *, int, sqlite3_value **),
-                              void        (*apStep)(sqlite3_context *, int, sqlite3_value **),
-                              void        (*apFinal)(sqlite3_context *),   // NOLINT(readability/casting)
-                              void        (*apDestroy)(void *))
+void Database::createFunction(const char* apFuncName,
+    int aNbArg,
+    bool abDeterministic,
+    void* apApp,
+    void (*apFunc)(sqlite3_context*, int, sqlite3_value**),
+    void (*apStep)(sqlite3_context*, int, sqlite3_value**),
+    void (*apFinal)(sqlite3_context*), // NOLINT(readability/casting)
+    void (*apDestroy)(void*))
 {
     int TextRep = SQLITE_UTF8;
     // optimization if deterministic function (e.g. of nondeterministic function random())
     if (abDeterministic)
     {
-        TextRep = TextRep|SQLITE_DETERMINISTIC;
+        TextRep = TextRep | SQLITE_DETERMINISTIC;
     }
     const int ret = sqlite3_create_function_v2(mpSQLite, apFuncName, aNbArg, TextRep,
-                                               apApp, apFunc, apStep, apFinal, apDestroy);
+        apApp, apFunc, apStep, apFinal, apDestroy);
     check(ret);
 }
-
 // Load an extension into the sqlite database. Only affects the current connection.
 // Parameter details can be found here: http://www.sqlite.org/c3ref/load_extension.html
-void Database::loadExtension(const char* apExtensionName, const char *apEntryPointName)
+void Database::loadExtension(const char* apExtensionName, const char* apEntryPointName)
 {
 #ifdef SQLITE_OMIT_LOAD_EXTENSION
     // Unused
     (void)apExtensionName;
     (void)apEntryPointName;
-
     throw std::runtime_error("sqlite extensions are disabled");
 #else
 #ifdef SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION // Since SQLite 3.13 (2016-05-18):
@@ -229,12 +204,10 @@ void Database::loadExtension(const char* apExtensionName, const char *apEntryPoi
     int ret = sqlite3_enable_load_extension(mpSQLite, 1);
 #endif
     check(ret);
-
     ret = sqlite3_load_extension(mpSQLite, apExtensionName, apEntryPointName, 0);
     check(ret);
 #endif
 }
-
 // Set the key for the current sqlite database instance.
 void Database::key(const std::string& aKey) const
 {
@@ -253,7 +226,6 @@ void Database::key(const std::string& aKey) const
     }
 #endif // SQLITE_HAS_CODEC
 }
-
 // Reset the key for the current sqlite database instance.
 void Database::rekey(const std::string& aNewKey) const
 {
@@ -275,7 +247,6 @@ void Database::rekey(const std::string& aNewKey) const
     throw exception;
 #endif // SQLITE_HAS_CODEC
 }
-
 // Test if a file contains an unencrypted database.
 bool Database::isUnencrypted(const std::string& aFilename)
 {
@@ -299,5 +270,4 @@ bool Database::isUnencrypted(const std::string& aFilename)
     const SQLite::Exception exception("Could not open database, the aFilename parameter was empty.");
     throw exception;
 }
-
-}  // namespace SQLite
+} // namespace SQLite

thirdparty/SQLiteCpp/src/Exception.cpp

@@ -9,59 +9,66 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Exception.h>
-
 #include <sqlite3.h>
-
-
 namespace SQLite
 {
-
-Exception::Exception(const char* aErrorMessage) :
-    std::runtime_error(aErrorMessage),
-    mErrcode(-1), // 0 would be SQLITE_OK, which doesn't make sense
+Exception::Exception(const char* aErrorMessage)
+    :
+    std::runtime_error(aErrorMessage)
+    ,
+    mErrcode(-1)
+    , // 0 would be SQLITE_OK, which doesn't make sense
     mExtendedErrcode(-1)
 {
 }
-Exception::Exception(const std::string& aErrorMessage) :
-    std::runtime_error(aErrorMessage),
-    mErrcode(-1), // 0 would be SQLITE_OK, which doesn't make sense
+Exception::Exception(const std::string& aErrorMessage)
+    :
+    std::runtime_error(aErrorMessage)
+    ,
+    mErrcode(-1)
+    , // 0 would be SQLITE_OK, which doesn't make sense
     mExtendedErrcode(-1)
 {
 }
-
-Exception::Exception(const char* aErrorMessage, int ret) :
-    std::runtime_error(aErrorMessage),
-    mErrcode(ret),
+Exception::Exception(const char* aErrorMessage, int ret)
+    :
+    std::runtime_error(aErrorMessage)
+    ,
+    mErrcode(ret)
+    ,
     mExtendedErrcode(-1)
 {
 }
-
-Exception::Exception(const std::string& aErrorMessage, int ret) :
-    std::runtime_error(aErrorMessage),
-    mErrcode(ret),
+Exception::Exception(const std::string& aErrorMessage, int ret)
+    :
+    std::runtime_error(aErrorMessage)
+    ,
+    mErrcode(ret)
+    ,
     mExtendedErrcode(-1)
 {
 }
-
-Exception::Exception(sqlite3* apSQLite) :
-    std::runtime_error(sqlite3_errmsg(apSQLite)),
-    mErrcode(sqlite3_errcode(apSQLite)),
+Exception::Exception(sqlite3* apSQLite)
+    :
+    std::runtime_error(sqlite3_errmsg(apSQLite))
+    ,
+    mErrcode(sqlite3_errcode(apSQLite))
+    ,
     mExtendedErrcode(sqlite3_extended_errcode(apSQLite))
 {
 }
-
-Exception::Exception(sqlite3* apSQLite, int ret) :
-    std::runtime_error(sqlite3_errmsg(apSQLite)),
-    mErrcode(ret),
+Exception::Exception(sqlite3* apSQLite, int ret)
+    :
+    std::runtime_error(sqlite3_errmsg(apSQLite))
+    ,
+    mErrcode(ret)
+    ,
     mExtendedErrcode(sqlite3_extended_errcode(apSQLite))
 {
 }
-
 // Return a string, solely based on the error code
 const char* Exception::getErrorStr() const noexcept // nothrow
 {
     return sqlite3_errstr(mErrcode);
 }
-
-
-}  // namespace SQLite
+} // namespace SQLite

thirdparty/SQLiteCpp/src/Statement.cpp

@@ -9,45 +9,54 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Statement.h>
-
 #include <SQLiteCpp/Database.h>
 #include <SQLiteCpp/Column.h>
 #include <SQLiteCpp/Assertion.h>
 #include <SQLiteCpp/Exception.h>
-
 #include <sqlite3.h>
-
 namespace SQLite
 {
-
 // Compile and register the SQL query for the provided SQLite Database Connection
-Statement::Statement(Database &aDatabase, const char* apQuery) :
-    mQuery(apQuery),
-    mStmtPtr(aDatabase.mpSQLite, mQuery), // prepare the SQL query, and ref count (needs Database friendship)
-    mColumnCount(0),
-    mbHasRow(false),
+Statement::Statement(Database& aDatabase, const char* apQuery)
+    :
+    mQuery(apQuery)
+    ,
+    mStmtPtr(aDatabase.mpSQLite, mQuery)
+    , // prepare the SQL query, and ref count (needs Database friendship)
+    mColumnCount(0)
+    ,
+    mbHasRow(false)
+    ,
     mbDone(false)
 {
     mColumnCount = sqlite3_column_count(mStmtPtr);
 }
-
 // Compile and register the SQL query for the provided SQLite Database Connection
-Statement::Statement(Database &aDatabase, const std::string& aQuery) :
-    mQuery(aQuery),
-    mStmtPtr(aDatabase.mpSQLite, mQuery), // prepare the SQL query, and ref count (needs Database friendship)
-    mColumnCount(0),
-    mbHasRow(false),
+Statement::Statement(Database& aDatabase, const std::string& aQuery)
+    :
+    mQuery(aQuery)
+    ,
+    mStmtPtr(aDatabase.mpSQLite, mQuery)
+    , // prepare the SQL query, and ref count (needs Database friendship)
+    mColumnCount(0)
+    ,
+    mbHasRow(false)
+    ,
     mbDone(false)
 {
     mColumnCount = sqlite3_column_count(mStmtPtr);
 }
-
 #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600)
-Statement::Statement(Statement&& aStatement) noexcept :
-    mQuery(std::move(aStatement.mQuery)),
-    mStmtPtr(std::move(aStatement.mStmtPtr)),
-    mColumnCount(aStatement.mColumnCount),
-    mbHasRow(aStatement.mbHasRow),
+Statement::Statement(Statement&& aStatement) noexcept
+    :
+    mQuery(std::move(aStatement.mQuery))
+    ,
+    mStmtPtr(std::move(aStatement.mStmtPtr))
+    ,
+    mColumnCount(aStatement.mColumnCount)
+    ,
+    mbHasRow(aStatement.mbHasRow)
+    ,
     mbDone(aStatement.mbDone)
 {
     aStatement.mColumnCount = 0;
@@ -55,114 +64,97 @@ Statement::Statement(Statement&& aStatement) noexcept :
     aStatement.mbDone = false;
 }
 #endif
-
 // Finalize and unregister the SQL query from the SQLite Database Connection.
 Statement::~Statement()
 {
     // the finalization will be done by the destructor of the last shared pointer
 }
-
 // Reset the statement to make it ready for a new execution (see also #clearBindings() bellow)
 void Statement::reset()
 {
     const int ret = tryReset();
     check(ret);
 }
-
 int Statement::tryReset() noexcept
 {
     mbHasRow = false;
     mbDone = false;
     return sqlite3_reset(mStmtPtr);
 }
-
 // Clears away all the bindings of a prepared statement (can be associated with #reset() above).
 void Statement::clearBindings()
 {
     const int ret = sqlite3_clear_bindings(mStmtPtr);
     check(ret);
 }
-
 // Bind an int value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const int aValue)
 {
     const int ret = sqlite3_bind_int(mStmtPtr, aIndex, aValue);
     check(ret);
 }
-
 // Bind a 32bits unsigned int value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const unsigned aValue)
 {
     const int ret = sqlite3_bind_int64(mStmtPtr, aIndex, aValue);
     check(ret);
 }
-
 // Bind a 64bits int value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const long long aValue)
 {
     const int ret = sqlite3_bind_int64(mStmtPtr, aIndex, aValue);
     check(ret);
 }
-
 // Bind a double (64bits float) value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const double aValue)
 {
     const int ret = sqlite3_bind_double(mStmtPtr, aIndex, aValue);
     check(ret);
 }
-
 // Bind a string value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const std::string& aValue)
 {
     const int ret = sqlite3_bind_text(mStmtPtr, aIndex, aValue.c_str(),
-                                      static_cast<int>(aValue.size()), SQLITE_TRANSIENT);
+        static_cast<int>(aValue.size()), SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a text value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const char* apValue)
 {
     const int ret = sqlite3_bind_text(mStmtPtr, aIndex, apValue, -1, SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a binary blob value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex, const void* apValue, const int aSize)
 {
     const int ret = sqlite3_bind_blob(mStmtPtr, aIndex, apValue, aSize, SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a string value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const int aIndex, const std::string& aValue)
 {
     const int ret = sqlite3_bind_text(mStmtPtr, aIndex, aValue.c_str(),
-                                      static_cast<int>(aValue.size()), SQLITE_STATIC);
+        static_cast<int>(aValue.size()), SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a text value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const int aIndex, const char* apValue)
 {
     const int ret = sqlite3_bind_text(mStmtPtr, aIndex, apValue, -1, SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a binary blob value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const int aIndex, const void* apValue, const int aSize)
 {
     const int ret = sqlite3_bind_blob(mStmtPtr, aIndex, apValue, aSize, SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a NULL value to a parameter "?", "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const int aIndex)
 {
     const int ret = sqlite3_bind_null(mStmtPtr, aIndex);
     check(ret);
 }
-
-
 // Bind an int value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const int aValue)
 {
@@ -170,7 +162,6 @@ void Statement::bind(const char* apName, const int aValue)
     const int ret = sqlite3_bind_int(mStmtPtr, index, aValue);
     check(ret);
 }
-
 // Bind a 32bits unsigned int value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const unsigned aValue)
 {
@@ -178,7 +169,6 @@ void Statement::bind(const char* apName, const unsigned aValue)
     const int ret = sqlite3_bind_int64(mStmtPtr, index, aValue);
     check(ret);
 }
-
 // Bind a 64bits int value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const long long aValue)
 {
@@ -186,7 +176,6 @@ void Statement::bind(const char* apName, const long long aValue)
     const int ret = sqlite3_bind_int64(mStmtPtr, index, aValue);
     check(ret);
 }
-
 // Bind a double (64bits float) value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const double aValue)
 {
@@ -194,16 +183,14 @@ void Statement::bind(const char* apName, const double aValue)
     const int ret = sqlite3_bind_double(mStmtPtr, index, aValue);
     check(ret);
 }
-
 // Bind a string value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const std::string& aValue)
 {
     const int index = sqlite3_bind_parameter_index(mStmtPtr, apName);
     const int ret = sqlite3_bind_text(mStmtPtr, index, aValue.c_str(),
-                                      static_cast<int>(aValue.size()), SQLITE_TRANSIENT);
+        static_cast<int>(aValue.size()), SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a text value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const char* apValue)
 {
@@ -211,7 +198,6 @@ void Statement::bind(const char* apName, const char* apValue)
     const int ret = sqlite3_bind_text(mStmtPtr, index, apValue, -1, SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a binary blob value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName, const void* apValue, const int aSize)
 {
@@ -219,16 +205,14 @@ void Statement::bind(const char* apName, const void* apValue, const int aSize)
     const int ret = sqlite3_bind_blob(mStmtPtr, index, apValue, aSize, SQLITE_TRANSIENT);
     check(ret);
 }
-
 // Bind a string value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const char* apName, const std::string& aValue)
 {
     const int index = sqlite3_bind_parameter_index(mStmtPtr, apName);
     const int ret = sqlite3_bind_text(mStmtPtr, index, aValue.c_str(),
-                                      static_cast<int>(aValue.size()), SQLITE_STATIC);
+        static_cast<int>(aValue.size()), SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a text value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const char* apName, const char* apValue)
 {
@@ -236,7 +220,6 @@ void Statement::bindNoCopy(const char* apName, const char* apValue)
     const int ret = sqlite3_bind_text(mStmtPtr, index, apValue, -1, SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a binary blob value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bindNoCopy(const char* apName, const void* apValue, const int aSize)
 {
@@ -244,7 +227,6 @@ void Statement::bindNoCopy(const char* apName, const void* apValue, const int aS
     const int ret = sqlite3_bind_blob(mStmtPtr, index, apValue, aSize, SQLITE_STATIC);
     check(ret);
 }
-
 // Bind a NULL value to a parameter "?NNN", ":VVV", "@VVV" or "$VVV" in the SQL prepared statement
 void Statement::bind(const char* apName)
 {
@@ -252,8 +234,6 @@ void Statement::bind(const char* apName)
     const int ret = sqlite3_bind_null(mStmtPtr, index);
     check(ret);
 }
-
-
 // Execute a step of the query to fetch one row of results
 bool Statement::executeStep()
 {
@@ -269,10 +249,8 @@ bool Statement::executeStep()
             throw SQLite::Exception("Statement needs to be reseted", ret);
         }
     }
-
     return mbHasRow; // true only if one row is accessible by getColumn(N)
 }
-
 // Execute a one-step query with no expected result
 int Statement::exec()
 {
@@ -292,11 +270,9 @@ int Statement::exec()
             throw SQLite::Exception("Statement needs to be reseted", ret);
         }
     }
-
     // Return the number of rows modified by those SQL statements (INSERT, UPDATE or DELETE)
     return sqlite3_changes(mStmtPtr);
 }
-
 int Statement::tryExecuteStep() noexcept
 {
     if (false == mbDone)
@@ -316,7 +292,6 @@ int Statement::tryExecuteStep() noexcept
             mbHasRow = false;
             mbDone = false;
         }
-
         return ret;
     }
     else
@@ -325,30 +300,24 @@ int Statement::tryExecuteStep() noexcept
         return SQLITE_MISUSE;
     }
 }
-
-
 // Return a copy of the column data specified by its index starting at 0
 // (use the Column copy-constructor)
 Column Statement::getColumn(const int aIndex)
 {
     checkRow();
     checkIndex(aIndex);
-
     // Share the Statement Object handle with the new Column created
     return Column(mStmtPtr, aIndex);
 }
-
 // Return a copy of the column data specified by its column name starting at 0
 // (use the Column copy-constructor)
-Column  Statement::getColumn(const char* apName)
+Column Statement::getColumn(const char* apName)
 {
     checkRow();
     const int index = getColumnIndex(apName);
-
     // Share the Statement Object handle with the new Column created
     return Column(mStmtPtr, index);
 }
-
 // Test if the column is NULL
 bool Statement::isColumnNull(const int aIndex) const
 {
@@ -356,21 +325,18 @@ bool Statement::isColumnNull(const int aIndex) const
     checkIndex(aIndex);
     return (SQLITE_NULL == sqlite3_column_type(mStmtPtr, aIndex));
 }
-
 bool Statement::isColumnNull(const char* apName) const
 {
     checkRow();
     const int index = getColumnIndex(apName);
     return (SQLITE_NULL == sqlite3_column_type(mStmtPtr, index));
 }
-
 // Return the named assigned to the specified result column (potentially aliased)
 const char* Statement::getColumnName(const int aIndex) const
 {
     checkIndex(aIndex);
     return sqlite3_column_name(mStmtPtr, aIndex);
 }
-
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
 // Return the named assigned to the specified result column (potentially aliased)
 const char* Statement::getColumnOriginName(const int aIndex) const
@@ -379,7 +345,6 @@ const char* Statement::getColumnOriginName(const int aIndex) const
     return sqlite3_column_origin_name(mStmtPtr, aIndex);
 }
 #endif
-
 // Return the index of the specified (potentially aliased) column name
 int Statement::getColumnIndex(const char* apName) const
 {
@@ -392,60 +357,55 @@ int Statement::getColumnIndex(const char* apName) const
             mColumnNames[pName] = i;
         }
     }
-
     const TColumnNames::const_iterator iIndex = mColumnNames.find(apName);
     if (iIndex == mColumnNames.end())
     {
         throw SQLite::Exception("Unknown column name.");
     }
-
     return (*iIndex).second;
 }
-
 int Statement::getBindParameterCount() const noexcept
 {
     return sqlite3_bind_parameter_count(mStmtPtr);
 }
-
 // Return the numeric result code for the most recent failed API call (if any).
 int Statement::getErrorCode() const noexcept // nothrow
 {
     return sqlite3_errcode(mStmtPtr);
 }
-
 // Return the extended numeric result code for the most recent failed API call (if any).
 int Statement::getExtendedErrorCode() const noexcept // nothrow
 {
     return sqlite3_extended_errcode(mStmtPtr);
 }
-
 // Return UTF-8 encoded English language explanation of the most recent failed API call (if any).
 const char* Statement::getErrorMsg() const noexcept // nothrow
 {
     return sqlite3_errmsg(mStmtPtr);
 }
-
 // Return a UTF-8 string containing the SQL text of prepared statement with bound parameters expanded.
-std::string Statement::getExpandedSQL() {
+std::string Statement::getExpandedSQL()
+{
     char* expanded = sqlite3_expanded_sql(mStmtPtr);
     std::string expandedString(expanded);
     sqlite3_free(expanded);
     return expandedString;
 }
-
 ////////////////////////////////////////////////////////////////////////////////
 // Internal class : shared pointer to the sqlite3_stmt SQLite Statement Object
 ////////////////////////////////////////////////////////////////////////////////
-
 /**
  * @brief Prepare the statement and initialize its reference counter
  *
  * @param[in] apSQLite  The sqlite3 database connexion
  * @param[in] aQuery    The SQL query string to prepare
  */
-Statement::Ptr::Ptr(sqlite3* apSQLite, std::string& aQuery) :
-    mpSQLite(apSQLite),
-    mpStmt(NULL),
+Statement::Ptr::Ptr(sqlite3* apSQLite, std::string& aQuery)
+    :
+    mpSQLite(apSQLite)
+    ,
+    mpStmt(NULL)
+    ,
     mpRefCount(NULL)
 {
     const int ret = sqlite3_prepare_v2(apSQLite, aQuery.c_str(), static_cast<int>(aQuery.size()), &mpStmt, NULL);
@@ -456,31 +416,34 @@ Statement::Ptr::Ptr(sqlite3* apSQLite, std::string& aQuery) :
     // Initialize the reference counter of the sqlite3_stmt :
     // used to share the mStmtPtr between Statement and Column objects;
     // This is needed to enable Column objects to live longer than the Statement objet it refers to.
-    mpRefCount = new unsigned int(1);  // NOLINT(readability/casting)
+    mpRefCount = new unsigned int(1); // NOLINT(readability/casting)
 }
-
 /**
  * @brief Copy constructor increments the ref counter
  *
  * @param[in] aPtr Pointer to copy
  */
-Statement::Ptr::Ptr(const Statement::Ptr& aPtr) :
-    mpSQLite(aPtr.mpSQLite),
-    mpStmt(aPtr.mpStmt),
+Statement::Ptr::Ptr(const Statement::Ptr& aPtr)
+    :
+    mpSQLite(aPtr.mpSQLite)
+    ,
+    mpStmt(aPtr.mpStmt)
+    ,
     mpRefCount(aPtr.mpRefCount)
 {
     assert(NULL != mpRefCount);
     assert(0 != *mpRefCount);
-
     // Increment the reference counter of the sqlite3_stmt,
     // asking not to finalize the sqlite3_stmt during the lifetime of the new objet
     ++(*mpRefCount);
 }
-
 #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600)
-Statement::Ptr::Ptr(Ptr&& aPtr) :
-    mpSQLite(aPtr.mpSQLite),
-    mpStmt(aPtr.mpStmt),
+Statement::Ptr::Ptr(Ptr&& aPtr)
+    :
+    mpSQLite(aPtr.mpSQLite)
+    ,
+    mpStmt(aPtr.mpStmt)
+    ,
     mpRefCount(aPtr.mpRefCount)
 {
     aPtr.mpSQLite = NULL;
@@ -488,7 +451,6 @@ Statement::Ptr::Ptr(Ptr&& aPtr) :
     aPtr.mpRefCount = NULL;
 }
 #endif
-
 /**
  * @brief Decrement the ref counter and finalize the sqlite3_stmt when it reaches 0
  */
@@ -497,7 +459,6 @@ Statement::Ptr::~Ptr()
     if (NULL != mpRefCount)
     {
         assert(0 != *mpRefCount);
-
         // Decrement and check the reference counter of the sqlite3_stmt
         --(*mpRefCount);
         if (0 == *mpRefCount)
@@ -505,7 +466,6 @@ Statement::Ptr::~Ptr()
             // If count reaches zero, finalize the sqlite3_stmt, as no Statement nor Column objet use it anymore.
             // No need to check the return code, as it is the same as the last statement evaluation.
             sqlite3_finalize(mpStmt);
-
             // and delete the reference counter
             delete mpRefCount;
             mpRefCount = NULL;
@@ -514,6 +474,4 @@ Statement::Ptr::~Ptr()
         // else, the finalization will be done later, by the last object
     }
 }
-
-
-}  // namespace SQLite
+} // namespace SQLite

thirdparty/SQLiteCpp/src/Transaction.cpp

@@ -9,23 +9,19 @@
  * or copy at http://opensource.org/licenses/MIT)
  */
 #include <SQLiteCpp/Transaction.h>
-
 #include <SQLiteCpp/Database.h>
 #include <SQLiteCpp/Assertion.h>
-
-
 namespace SQLite
 {
-
-
 // Begins the SQLite transaction
-Transaction::Transaction(Database& aDatabase) :
-    mDatabase(aDatabase),
+Transaction::Transaction(Database& aDatabase)
+    :
+    mDatabase(aDatabase)
+    ,
     mbCommited(false)
 {
     mDatabase.exec("BEGIN");
 }
-
 // Safely rollback the transaction if it has not been committed.
 Transaction::~Transaction()
 {
@@ -41,7 +37,6 @@ Transaction::~Transaction()
         }
     }
 }
-
 // Commit the transaction.
 void Transaction::commit()
 {
@@ -55,6 +50,4 @@ void Transaction::commit()
         throw SQLite::Exception("Transaction already commited.");
     }
 }
-
-
-}  // namespace SQLite
+} // namespace SQLite