Fix all dem problems

Author: dedmen

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/MariaDB/mariadb-connector-c
 [submodule "mariadbpp"]
 	path = mariadbpp
-	url = https://github.com/viaduck/mariadbpp
+	url = https://github.com/dedmen/mariadbpp
 [submodule "wolfssl"]
 	path = wolfssl
 	url = https://github.com/wolfSSL/wolfssl

src/connection.cpp

@@ -18,7 +18,11 @@ class GameDataDBConnection : public game_data {
     float get_as_number() const override { return 0.f; }
     const r_string& get_as_string() const override { static r_string nm("stuff"sv); return nm; }
     game_data* copy() const override { return new GameDataDBConnection(*this); } //#TODO make sure this works
-    r_string to_string() const override { return r_string("stuff"sv); }
+    r_string to_string() const override {
+        if (!session) return r_string("<no session>"sv);
+        if (!session->connected()) return r_string("<not connected>"sv);
+        return "<connected to database: " + session->schema() + ">";        
+    }
     //virtual bool equals(const game_data*) const override; //#TODO isEqualTo on hashMaps would be quite nice I guess?
     const char* type_as_string() const override { return "databaseConnection"; }
     bool is_nil() const override { return false; }
@@ -92,7 +96,7 @@ game_value Connection::cmd_query(uintptr_t, game_value_parameter con, game_value
     auto res = statement->query();
 
     auto gd_res = new GameDataDBResult();
-    gd_res->res = std::move(res);
+    gd_res->res = res;
 
     return gd_res;
 }

src/res.cpp

@@ -26,6 +26,7 @@ game_value Result::cmd_lastInsertId(uintptr_t, game_value_parameter right) {
 
 game_value Result::cmd_toArray(uintptr_t, game_value_parameter right) {
     auto& res = right.get_as<GameDataDBResult>()->res;
+    if (!res) return auto_array<game_value>();
     auto_array<game_value> result;
 
     while (res->next()) {
@@ -35,29 +36,29 @@ game_value Result::cmd_toArray(uintptr_t, game_value_parameter right) {
 
             switch (res->column_type(i)) {
                 case mariadb::value::null: row.emplace_back(game_value{}); break;
-                case mariadb::value::date: row.emplace_back(res->get_string(i)); break;
-                case mariadb::value::date_time: row.emplace_back(res->get_string(i)); break;
-                case mariadb::value::time: row.emplace_back(res->get_string(i)); break;
+                case mariadb::value::date: row.emplace_back(res->get_date(i).str()); break;
+                case mariadb::value::date_time: row.emplace_back(res->get_date_time(i).str()); break;
+                case mariadb::value::time: row.emplace_back(res->get_time(i).str_time()); break;
                 case mariadb::value::string: row.emplace_back(res->get_string(i)); break;
                 case mariadb::value::boolean: row.emplace_back(res->get_boolean(i)); break;
                 case mariadb::value::decimal: row.emplace_back(res->get_decimal(i).float32()); break;
-                case mariadb::value::unsigned8: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::signed8: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::unsigned16: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::signed16: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::unsigned32: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::signed32: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::unsigned64: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::signed64: row.emplace_back(res->get_float(i)); break;
+                case mariadb::value::unsigned8: row.emplace_back(static_cast<float>(res->get_unsigned8(i))); break;
+                case mariadb::value::signed8: row.emplace_back(static_cast<float>(res->get_signed8(i))); break;
+                case mariadb::value::unsigned16: row.emplace_back(static_cast<float>(res->get_unsigned16(i))); break;
+                case mariadb::value::signed16: row.emplace_back(static_cast<float>(res->get_signed16(i))); break;
+                case mariadb::value::unsigned32: row.emplace_back(static_cast<float>(res->get_unsigned32(i))); break;
+                case mariadb::value::signed32: row.emplace_back(static_cast<float>(res->get_signed32(i))); break;
+                case mariadb::value::unsigned64: row.emplace_back(static_cast<float>(res->get_unsigned64(i))); break;
+                case mariadb::value::signed64: row.emplace_back(static_cast<float>(res->get_signed64(i))); break;
                 case mariadb::value::float32: row.emplace_back(res->get_float(i)); break;
-                case mariadb::value::double64: row.emplace_back(res->get_float(i)); break;
+                case mariadb::value::double64: row.emplace_back(static_cast<float>(res->get_double(i))); break;
                 case mariadb::value::enumeration: row.emplace_back(res->get_string(i)); break;
                 default: ;
             }            
         }
         result.emplace_back(std::move(row));
     }
-	return game_value(result);
+	return result;
 }
 
 void ::Result::initCommands() {

src/res.h

@@ -36,7 +36,7 @@ class GameDataDBResult : public game_data {
     bool get_as_bool() const override { return true; }
     float get_as_number() const override { return 0.f; }
     const r_string& get_as_string() const override { static r_string nm("TODO"sv); return nm; }
-    game_data* copy() const override { return new GameDataDBResult(); } //#TODO can't do that dave
+    game_data* copy() const override { return new GameDataDBResult(*this); } //#TODO can't do that dave
     r_string to_string() const override { return r_string("TODO"sv); }
     //virtual bool equals(const game_data*) const override; //#TODO isEqualTo on hashMaps would be quite nice I guess?
     const char* type_as_string() const override { return "databaseQuery"; }