Implement statement specific options

Author: dedmen

docs/intro/config-file.rst

@@ -27,6 +27,10 @@ The InterceptDB Config file
       isThisALongQuery=1 AND
       queriesCanBeMultiline=1 AND
       thatsWhyILikeYAML=5;
+     queryWithOptions:
+      query: SELECT NOW(), tinyIntValue FROM MyTable;
+      parseDateType: array #I want this specific statement to return DateTime values in array format
+      parseTinyintAsBool: true #I want this specific statement to return my tinyInt as a boolean in dbResultTo(Parsed)Array
     
     global:
      enableDynamicQueries: true #Allow queries to be created from SQF, if false only statements from config are allowed
@@ -47,4 +51,4 @@ Config has to be in ``Arma 3/@InterceptDB/config.yaml`` Other subfolders or rena
 
 The config is loaded at preInit. If anything on the config loading fails, a error will be printed to the RPT.
 
-#TODO if people need it, add ability to set connection options in config.
+Per-statement options take precendence over global options

src/config.cpp

@@ -83,7 +83,17 @@ void Config::reloadConfig() {
 
     for (auto& it : config["statements"]) {
         r_string stmtName = it.first.as<r_string>();
-        statements[stmtName] = it.second.as<r_string>();
+        if (it.IsMap()) {
+            if (!it["query"]) throw std::runtime_error(("statement "+stmtName+" has no 'query' entry").c_str());
+
+            statements[stmtName] = {
+                it["query"].as<r_string>(),
+                it["parseTinyintAsBool"].as<bool>(false),
+                dateTypeFromString(config["global"]["parseDateType"].as<r_string>("string"sv))
+            };
+        } else {
+            statements[stmtName] = {it.second.as<r_string>()};
+        }
     }
 
 #pragma endregion statements
@@ -92,6 +102,7 @@ void Config::reloadConfig() {
 
     if (!config["global"].IsMap()) throw std::runtime_error("Config Global entry is not a map");
 
+
     dynamicQueriesEnabled = config["global"]["enableDynamicQueries"].as<bool>(true);
     parseTinyintAsBool = config["global"]["parseTinyintAsBool"].as<bool>(false);
     dateType = dateTypeFromString(config["global"]["parseDateType"].as<r_string>("string"sv));

src/config.h

@@ -16,16 +16,29 @@ enum class ConfigDateType {
 
 ConfigDateType dateTypeFromString(std::string_view str);
 
+class ConfigStatement {
+public:
+    r_string query;
+    bool parseTinyintAsBool = false;
+    ConfigDateType dateType = ConfigDateType::humanString;
+};
+
 
 class Config : public intercept::singleton<Config> {
 
 public:
     void reloadConfig();
 
+    ConfigStatement getStatement(r_string name) {
+        auto found = statements.find(name);
+        if (found == statements.end()) return ConfigStatement();
+        return found->second;
+    }
+
     r_string getQuery(r_string name) {
         auto found = statements.find(name);
         if (found == statements.end()) return r_string();
-        return found->second;
+        return found->second.query;
     }
 
     mariadb::account_ref getAccount(r_string name) {
@@ -58,7 +71,7 @@ class Config : public intercept::singleton<Config> {
 
 private:
     std::map<intercept::types::r_string, mariadb::account_ref> accounts;
-    std::map<intercept::types::r_string, intercept::types::r_string> statements;
+    std::map<intercept::types::r_string, ConfigStatement> statements;
     std::map<intercept::types::r_string, std::filesystem::path> schemas;
     bool dynamicQueriesEnabled = true;
     bool parseTinyintAsBool = false;

src/connection.cpp

@@ -78,10 +78,13 @@ bool Connection::throwQueryError(game_state& gs, mariadb::connection_ref connect
     return false; //error was not handled and we threw it
 }
 
-GameDataDBAsyncResult* Connection::pushAsyncQuery(game_state& gs, mariadb::connection_ref connection, auto_array<game_value> boundValues, r_string queryString) {
+GameDataDBAsyncResult* Connection::pushAsyncQuery(game_state& gs, mariadb::connection_ref connection, ref<GameDataDBQuery> query) {
     auto gd_res = new GameDataDBAsyncResult();
     gd_res->data = std::make_shared<GameDataDBAsyncResult::dataT>();
 
+    auto_array<game_value> boundValues = query->boundValues;
+    r_string queryString = query->getQueryString();
+    gd_res->data->statementName = query->isConfigQuery ? query->queryString : r_string{};
 
     //If we give them to task, it will destruct the array after task is done, and may call dealloc int he pool allocator
     std::vector<
@@ -209,6 +212,7 @@ class callstack_item_WaitForQueryResult : public vm_context::callstack_item {
             //push result onto stack.
             auto gd_res = new GameDataDBResult();
             gd_res->res = res->data->res;
+            gd_res->statementName = res->data->statementName;
             s->get_vm_context()->scriptStack[_stackEndAtStart] = game_value(gd_res);
             d1 = 2; //done
             //#TODO fix this. Cannot currently because task wants invoker lock, which it won't get while we freeze the game here
@@ -268,6 +272,7 @@ game_value Connection::cmd_execute(game_state& gs, game_value_parameter con, gam
 
             auto gd_res = new GameDataDBResult();
             gd_res->res = res;
+            gd_res->statementName = query->isConfigQuery ? query->queryString : r_string{};
             return gd_res;
         } catch (mariadb::exception::connection& x) {
             throwQueryError(gs, session, static_cast<size_t>(x.error_id()), static_cast<r_string>(x.what()), query->getQueryString());
@@ -281,7 +286,7 @@ game_value Connection::cmd_execute(game_state& gs, game_value_parameter con, gam
 
     auto& cs = gs.get_vm_context()->callstack;
 
-    auto gd_res = pushAsyncQuery(gs, session, query->boundValues, query->getQueryString());
+    auto gd_res = pushAsyncQuery(gs, session, query);
 
     auto newItem = new callstack_item_WaitForQueryResult(gd_res);
     newItem->_parent = cs.back();
@@ -300,7 +305,7 @@ game_value Connection::cmd_executeAsync(game_state& gs, game_value_parameter con
     auto session = con.get_as<GameDataDBConnection>()->session;
     auto query = qu.get_as<GameDataDBQuery>();
 
-    auto gd_res = pushAsyncQuery(gs, session, query->boundValues, query->getQueryString());
+    auto gd_res = pushAsyncQuery(gs, session, query);
     Threading::get().pushAsyncWork(gd_res);
     __itt_task_end(domainConnection);
     return gd_res;

src/connection.h

@@ -2,6 +2,7 @@
 #include <intercept.hpp>
 #include "mariadb++/connection.hpp"
 #include "res.h"
+#include "query.h"
 using namespace intercept;
 using namespace intercept::types;
 
@@ -10,7 +11,7 @@ using namespace intercept::types;
 class Connection {
 public:
     static bool throwQueryError(game_state& gs, mariadb::connection_ref connection, size_t errorID, r_string errorMessage, r_string queryString);
-    static [[nodiscard]] GameDataDBAsyncResult* pushAsyncQuery(game_state& gs, mariadb::connection_ref connection, auto_array<game_value> boundValues, r_string queryString);
+    static [[nodiscard]] GameDataDBAsyncResult* pushAsyncQuery(game_state& gs, mariadb::connection_ref connection, ref<GameDataDBQuery> query);
 
     static game_value cmd_createConnectionArray(game_state&, game_value_parameter right);
     static game_value cmd_createConnectionConfig(game_state&, game_value_parameter right);

src/res.cpp

@@ -150,12 +150,15 @@ game_value Result::cmd_lastInsertId(game_state&, game_value_parameter right) {
 }
 
 game_value Result::cmd_toArray(game_state&, game_value_parameter right) {
-    auto& res = right.get_as<GameDataDBResult>()->res;
+    auto& gdRes = right.get_as<GameDataDBResult>();
+    auto& res = gdRes->res;
     if (!res) return auto_array<game_value>();
     auto_array<game_value> result;
 
-    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(Config::get().getDateType());
-    const auto parseTinyintAsBool = Config::get().getTinyintAsBool();
+    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(
+        gdRes->statementName.empty() ? Config::get().getDateType() : Config::get().getStatement(gdRes->statementName).dateType);
+    const auto parseTinyintAsBool = 
+        gdRes->statementName.empty() ? Config::get().getTinyintAsBool() : Config::get().getStatement(gdRes->statementName).parseTinyintAsBool;
 
     while (res->next()) {
         auto_array<game_value> row;
@@ -204,12 +207,15 @@ game_value Result::cmd_toArray(game_state&, game_value_parameter right) {
 }
 
 game_value Result::cmd_toParsedArray(game_state& state, game_value_parameter right) {
-    auto& res = right.get_as<GameDataDBResult>()->res;
+    auto& gdRes = right.get_as<GameDataDBResult>();
+    auto& res = gdRes->res;
     if (!res) return auto_array<game_value>();
     auto_array<game_value> result;
 
-    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(Config::get().getDateType());
-    const auto parseTinyintAsBool = Config::get().getTinyintAsBool();
+    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(
+        gdRes->statementName.empty() ? Config::get().getDateType() : Config::get().getStatement(gdRes->statementName).dateType);
+    const auto parseTinyintAsBool = 
+        gdRes->statementName.empty() ? Config::get().getTinyintAsBool() : Config::get().getStatement(gdRes->statementName).parseTinyintAsBool;
 
     while (res->next()) {
         auto_array<game_value> row;

src/res.h

@@ -9,7 +9,6 @@ using namespace intercept::types;
 
 class Result {
 public:
-
 	static game_value cmd_affectedRows(game_state&, game_value_parameter right);
 	static game_value cmd_lastInsertId(game_state&, game_value_parameter right);
     static game_value cmd_toArray(game_state&, game_value_parameter right);
@@ -70,6 +69,7 @@ class GameDataDBResult : public game_data {
     }
 
     mariadb::result_set_ref res;
+    r_string statementName; //Is null if this was not a statement from config
 };
 
 class GameDataDBAsyncResult : public game_data {
@@ -113,6 +113,7 @@ class GameDataDBAsyncResult : public game_data {
     struct dataT {
         std::future<bool> fut;
         mariadb::result_set_ref res;
+        r_string statementName; //Is null if this was not a statement from config
         game_value callback;
         game_value callbackArgs;
     };