From 77d401e8d37acde5dfa5fbef343dd2b5fcd48f46 Mon Sep 17 00:00:00 2001
From: malloc <aleco@aroltd.com>
Date: Mon, 30 Apr 2018 17:11:14 -0500
Subject: [PATCH] Congratulations and thank you for your purchase!

---
 server/hard_schema.db-journal | Bin 0 -> 8720 bytes
 server/mem_schema.db          |   0
 server/mem_schema.db-journal  | Bin 0 -> 512 bytes
 server/src/db/_init_sql.cpp   |  15 +++++++++++++--
 server/src/db/database.cpp    |  19 ++++++++++++++++++-
 server/src/db/database.hpp    |  21 ++++++++++++++++-----
 6 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 server/hard_schema.db-journal
 create mode 100644 server/mem_schema.db
 create mode 100644 server/mem_schema.db-journal

diff --git a/server/hard_schema.db-journal b/server/hard_schema.db-journal
new file mode 100644
index 0000000000000000000000000000000000000000..9ea002f6077b52cdfbd2dc30c43a6cd8c4b6d2ea
GIT binary patch
literal 8720
zcmeI2OHbo45P;*hv}%Da;u0ZoFq~Qy79_NHyp5rT#3_jb+sh^eWhKN*Eae9j4xITJ
z2qAId&hOx_aA6!CeQZ`-5samYACnn-zL|@o7)Gx>UffK<EN>VY=q7p!9DQa2#NV)Y
zJ2Cxp^!K3Mp-Yf?LX2ffA?Pd!)I%Z!`caS^$ZOMU@3pM)efoC1ykO+Uu8nV#<@@p9
zW7ng1@0p<<2_OL^fCP{L5<mh-00|(0Hv;7aa`iU(GK217zF^MGkh5B+y}chhV%1|x
zxYF;9a&?b0#i?RHZBA!<idkAI6(eCqMIjYm<sOx;qB5}UIar5FP}pF8BPuHX3zqv-
z7Pt#NCQ}WYo^Y7gqU*d>(ax)-D%}#Q;RcF&?v}8+GFLF?=gFCy9GTUX*i6nG)?JJH
z!}F1W<442lC<!9)xfiBILIWu_0<Htn-cy2kcApMmAePrX{s{<*?eaqvTr-n5Yc<kJ
z_?{f^!(}!+iH}d?!<~3&njN4!q^uma58^qntakTE!8A>B{v+|JQTWLtGhiPjYtJd^
z&qg0d$^zvI31$wLO6Nt}Nam#FrpbK&e?`b0ChU}az7z;g$tbn>3JYvS7xlhtaE!FK
sN>%vo^8g9e_k3(f00|%gB!C2v01`j~NB{{S0VIF~kiaJ=p#T4P0`*qbXaE2J

literal 0
HcmV?d00001

diff --git a/server/mem_schema.db b/server/mem_schema.db
new file mode 100644
index 0000000..e69de29
diff --git a/server/mem_schema.db-journal b/server/mem_schema.db-journal
new file mode 100644
index 0000000000000000000000000000000000000000..88535c0f05f9d0035eeb8833912afaaf2c659d7f
GIT binary patch
literal 512
bcmZQzK!DK2$38-MOh8HiAu-AtwjlrjT}cAM

literal 0
HcmV?d00001

diff --git a/server/src/db/_init_sql.cpp b/server/src/db/_init_sql.cpp
index 32ced8f..7d03c35 100644
--- a/server/src/db/_init_sql.cpp
+++ b/server/src/db/_init_sql.cpp
@@ -1,8 +1,13 @@
 #include <vector>
 
 const char* _mem_db_sql =
-    "CREATE TABLE SERVER_LIST ( "
-    ");";
+    "CREATE TABLE `SERVER_LIST` ("
+        "`ID` INTEGER PRIMARY KEY AUTOINCREMENT,"
+        "`NAME` TEXT NOT NULL,"
+        "`LICENSE` TEXT NOT NULL,"
+        "`IP_ADDR` TEXT NOT NULL,"
+        "`PORT` INTEGER NOT NULL"
+    ");\n";
 
 const std::vector<const char*> _hard_db_sql = {
     /** START MIGRATION 0 **/
@@ -13,6 +18,12 @@ const std::vector<const char*> _hard_db_sql = {
         "PRIMARY KEY(`ID`)"
     ") WITHOUT ROWID;\n"
 
+    "CREATE TABLE `SERVER_LICENSES` ("
+        "`KEY_ID` TEXT NOT NULL UNIQUE,"
+        "`SECRET` TEXT NOT NULL UNIQUE,"
+        "`ALLOWANCE` INTEGER NOT NULL"
+    ");\n"
+
     "CREATE TABLE `USERS` ("
         "`ID` INTEGER PRIMARY KEY AUTOINCREMENT,"
         "`USERNAME` TEXT NOT NULL,"
diff --git a/server/src/db/database.cpp b/server/src/db/database.cpp
index 48baed7..bdd31e4 100644
--- a/server/src/db/database.cpp
+++ b/server/src/db/database.cpp
@@ -16,7 +16,9 @@ void sosc::db::init_databases() {
     sqlite3_exec(_ctx.mem_db, _mem_db_sql, nullptr, nullptr, nullptr);
 
     sqlite3_open("scape.db", &_ctx.hard_db);
-    
+    db::Query query("SELECT * FROM MIGRATIONS ORDER BY ID ASC");
+    auto results = query.GetResults();
+    while()
 
     _ctx.ready = true;
 }
@@ -29,3 +31,18 @@ void sosc::db::close_databases() {
     sqlite3_close(_ctx.hard_db);
     _ctx.ready = false;
 }
+
+sosc::db::Query::Query() : results(this) {
+    this->open = false;
+}
+
+sosc::db::Query::Query(const std::string& query) : results(this) {
+    this->open = false;
+    this->SetQuery(query);
+}
+
+void sosc::db::Query::SetQuery(const std::string &query) {
+    this->Close();
+
+    this->open = true;
+}
diff --git a/server/src/db/database.hpp b/server/src/db/database.hpp
index 4382e3e..90c8c11 100644
--- a/server/src/db/database.hpp
+++ b/server/src/db/database.hpp
@@ -21,20 +21,21 @@ public:
 
     template<typename T>
     T Get(int column);
-    std::string Get(int column, int type = DB_COL_TEXT);
+    template<typename T>
+    T Get(int column, int type);
 private:
-    ResultSet(Query* query, sqlite3_stmt* stmt);
-    sqlite3_stmt* statement;
+    ResultSet(Query* query);
     Query* query;
     bool readable;
 
     friend class Query;
 };
 
-double ResultSet::Get<double>(int column);
+/*double ResultSet::Get<double>(int column);
 int32_t ResultSet::Get<int32_t>(int column);
 int64_t ResultSet::Get<int64_t>(int column);
 sosc::time ResultSet::Get<sosc::time>(int column);
+std::string ResultSet::Get<std::string>(int column, int type = DB_COL_TEXT);*/
 
 class Query {
 public:
@@ -44,8 +45,12 @@ public:
 
     void NonQuery();
 
-    ResultSet* GetResults() const;
+    template<typename T>
+    T Scalar();
+    template<typename T>
+    T Scalar(int type);
 
+    ResultSet* GetResults() const;
     inline bool IsOpen() const {
         return this->open;
     }
@@ -60,6 +65,12 @@ private:
     bool open;
 };
 
+/*double Query::Scalar<double>();
+int32_t Query::Scalar<int32_t>();
+int64_t Query::Scalar<int64_t>();
+sosc::time Query::Scalar<sosc::time>();
+std::string Query::Scalar<std::string>(int type = DB_COL_TEXT);*/
+
 // THE FOLLOWING ARE NOT THREAD SAFE !!
 // CALL THEM ONLY WHEN MASTER POOL IS INACTIVE
 void init_databases();