.gitignore

@@ -1 +0,0 @@
-*.o

.vscode/settings.json

@@ -1,15 +1,6 @@
 {
     "files.associations": {
         "string": "cpp",
-        "vector": "cpp",
-        "*.tcc": "cpp",
-        "deque": "cpp",
-        "unordered_map": "cpp",
-        "system_error": "cpp",
-        "iostream": "cpp",
-        "type_traits": "cpp",
-        "tuple": "cpp",
-        "array": "cpp",
-        "utility": "cpp"
+        "vector": "cpp"
     }
 }

lib/sql3.hpp

@@ -1,5 +1,5 @@
-#ifndef _MARCELB_SQLITE3_
-#define _MARCELB_SQLITE3_
+#ifndef _SQL3_
+#define _SQL3_
 
 #include <stdio.h>
 #include <sqlite3.h>
@@ -8,38 +8,37 @@
 #include <string>
 #include <vector>
 #include <map>
+// #include <algorithm>
 #include <iostream>
-#include <mutex>
-using namespace std;
 
-namespace marcelb::SQlite3 {
+using namespace std;
 
 static string responseDatabase;
 static int callback(void* data, int argc, char** argv, char** azColName);
 
-class SQLite3 {
-    mutex io;
+class sql3 {
+    public:
+
     sqlite3* db;
     string path;
     bool keepOpen;
-
+    // map<string, vector<string>> model;
+    string Answer;
+    map<string, vector<string>> parsed;
+    
+    sql3(const string path, bool _keepOpen = false);
     bool open();
     bool close();
-    map<string, vector<string>> parse(const string& result);
-
-public:
-
-    // string Answer;
-    // map<string, vector<string>> parsed;
-    
-    SQLite3(const string path, bool _keepOpen = false);
+    bool run(const string sql_command);
+    string answer();
+    void mapit();
 
+    string ask(const string sql_command);
     map<string, vector<string>> query(const string sql_command);
-
-    ~SQLite3();
+    
+    ~sql3();
 
 };
 
-}
 
 #endif

src/sql3.cpp

@@ -0,0 +1,128 @@
+#include "../lib/sql3.hpp"
+
+sql3::sql3(const string _path, bool _keepOpen) {
+   path = _path;
+   keepOpen = _keepOpen;
+
+   if (keepOpen) {
+      if (open()) {
+         printf("[ERROR] Ne mogu otvoriti bazu podataka!");
+         exit(1);
+      }
+   }
+
+}
+
+bool sql3::open() {
+   uint operationStatus = sqlite3_open(path.c_str(), &db);
+   return operationStatus != SQLITE_OK;
+}
+
+bool sql3::close() {
+   uint operationStatus = sqlite3_close(db);
+   db = NULL;
+   return operationStatus != SQLITE_OK;
+}
+
+bool sql3::run(const string sql_command) {
+
+   if (!keepOpen) {
+      if (open()) {
+         printf("[ERROR] Ne mogu otvoriti bazu podataka!");
+         exit(1);
+      }
+   }
+
+   bool r = true;
+   char *messaggeError;
+   uint exec_stuts;
+   exec_stuts = sqlite3_exec(db, sql_command.c_str(), callback, NULL, &messaggeError);
+
+   if (exec_stuts != SQLITE_OK) {
+      // printf("[ERROR] Ne mogu čitati bazu podataka!");
+      sqlite3_free(messaggeError);
+      r = false;
+   }
+   else  {
+      Answer = responseDatabase;
+   }
+
+   if (!keepOpen) {
+      if(close()) {
+         printf ("ERROR Zatvaranja baze podataka!");
+      }
+   }
+
+   return r;
+}
+
+string sql3::answer() {
+   string _Answer = Answer;
+   Answer.clear();
+   return _Answer;
+}
+
+string sql3::ask(const string sql_command) {
+   if (!run(sql_command)) {
+      printf("[ERROR] Ne mogu čitati bazu podataka!");
+      return {};
+   }
+   else {
+      return answer();
+   }
+}
+
+map<string, vector<string>> sql3::query(const string sql_command) {
+   if (!run(sql_command)) {
+      printf("[ERROR] Ne mogu čitati bazu podataka!");
+      return {};
+   }
+   else {
+      mapit();
+      map<string, vector<string>> _parsed = parsed;
+      parsed.clear();
+      return _parsed;
+   }
+}
+
+void sql3::mapit() {
+   string a = Answer;
+
+   while (a.find("\n") < a.length()) {
+      uint lineend = a.find("\n");
+      string oneline = a.substr(0, lineend);
+      a.erase(0, lineend+1);
+      
+      size_t sep = oneline.find(" = ");
+      string key = oneline.substr(0, sep);
+      string value = oneline.substr(sep + 3, oneline.length());
+      value = value.substr(0, value.length());
+      
+      parsed[key].push_back(value);
+   }
+
+
+}
+
+sql3::~sql3() {
+   if(close()) {
+      printf ("ERROR Zatvaranja baze podataka!");
+   }
+}
+
+
+/**
+ * Callback funkcija za sqlite3 
+*/
+
+static int callback(void* data, int argc, char** argv, char** azColName) {
+   int i;
+   fprintf(stderr, "%s: ", (const char*)data);
+   char res[1000];
+   for (i = 0; i < argc; i++) {
+      sprintf(res, "%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
+      responseDatabase += res;
+      responseDatabase += '\n';
+   }
+   return 0;
+}

src/sqlite3.cpp

@@ -1,114 +0,0 @@
-#include "../lib/sqlite3.hpp"
-
-namespace marcelb::SQlite3 {
-
-SQLite3::SQLite3(const string _path, bool _keepOpen) {
-   path = _path;
-   keepOpen = _keepOpen;
-
-   if (keepOpen) {
-      if (open()) {
-         throw string("[ERROR] Unable to open database ");
-      }
-   }
-}
-
-bool SQLite3::open() {
-   uint operationStatus = sqlite3_open(path.c_str(), &db);
-   return operationStatus != SQLITE_OK;
-}
-
-bool SQLite3::close() {
-   uint operationStatus = sqlite3_close(db);
-   db = NULL;
-   return operationStatus != SQLITE_OK;
-}
-
-map<string, vector<string>> SQLite3::query(const string sql_command) {
-   io.lock();
-   if (!keepOpen) {
-      if (open()) {
-         io.unlock();
-         throw string("[ERROR] Unable to open database ");
-      }
-   }
-
-   bool r = true;
-   char *messaggeError;
-   uint exec_status;
-   exec_status = sqlite3_exec(db, sql_command.c_str(), callback, NULL, &messaggeError);
-
-   string result;
-   if (exec_status != SQLITE_OK) {
-      sqlite3_free(messaggeError);
-      r = false;
-   }
-   else  {
-      result = responseDatabase;
-      responseDatabase.clear();
-   }
-
-   if (!keepOpen) {
-      if(close()) {
-         io.unlock();
-         throw string("[ERROR] Unable to close database ");
-      }
-   }
-
-   map<string, vector<string>> _parsed;
-
-   if (!r) {
-      io.unlock();
-      throw string("[ERROR] Unable to read database ");
-   }
-
-   else {
-      _parsed = parse(result);
-   }
-   io.unlock();
-   return _parsed;
-}
-
-
-map<string, vector<string>> SQLite3::parse(const string& result) {
-   string a = result;
-   map<string, vector<string>> parsed;
-
-   while (a.find("\n") < a.length()) {
-      uint lineend = a.find("\n");
-      string oneline = a.substr(0, lineend);
-      a.erase(0, lineend+1);
-      
-      size_t sep = oneline.find(" = ");
-      string key = oneline.substr(0, sep);
-      string value = oneline.substr(sep + 3, oneline.length());
-      value = value.substr(0, value.length());
-      parsed[key].push_back(value);
-   }
-
-   return parsed;
-}
-
-SQLite3::~SQLite3() {
-   if(close()) {
-      // throw string("[ERROR] Unable to close database ");
-   }
-}
-
-
-/**
- * Callback funkcija za SQLite3 
-*/
-
-static int callback(void* data, int argc, char** argv, char** azColName) {
-   int i;
-   char res[1000];
-   for (i = 0; i < argc; i++) {
-      sprintf(res, "%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
-      responseDatabase += string(res) + string("\n");
-   }
-   return 0;
-}
-
-
-}

test/test.cpp

@@ -1,32 +1,19 @@
 #include <iostream>
-using namespace std;
 
+#include "../lib/sql3.hpp"
 
-#include "../lib/sqlite3.hpp"
-using namespace marcelb::SQlite3;
+using namespace std;
 
 int main() {
-    try {
 
-    SQLite3 mydb("../example/example.db", false);
+    sql3 mydb("../example/example.db", false);
 
-    // cout << mydb.ask("Select * from Tab1");
+    //cout << mydb.ask("Select * from Tab1");
     // cout << mydb.ask("INSERT INTO Tab1 VALUES(3,'Pakora', 'marijanab@bitelex.ml');");
 
     auto res = mydb.query("Select * from Tab1");
-    // cout << endl <<  res["NAME"][1];
-
-    // cout << endl <<  res["MAIL"][1];
-
-    for (auto i : res) {
-        for (auto j: i.second) {
-            cout << i.first << " : " << j << endl; 
-        }
-    }
 
-    } catch (const string err) {
-        cout << err << endl;
-    }
+    cout << endl <<  res["NAME"][0];
 
     return 0;
 }