Fixed always loading statement specific config

Author: dedmen

src/config.cpp

@@ -86,11 +86,14 @@ void Config::reloadConfig() {
         if (it.second.IsMap()) {
             if (!it.second["query"]) throw std::runtime_error(("statement "+stmtName+" has no 'query' entry").c_str());
 
-            statements[stmtName] = {
-                it.second["query"].as<r_string>(),
-                it.second["parseTinyintAsBool"].as<bool>(false),
-                dateTypeFromString(it.second["parseDateType"].as<r_string>("string"sv))
-            };
+            ConfigStatement stmt;
+            stmt.query = it.second["query"].as<r_string>();
+            if (it.second["parseTinyintAsBool"].IsDefined())
+                stmt.parseTinyintAsBool = it.second["parseTinyintAsBool"].as<bool>();
+            if (it.second["parseDateType"].IsDefined())
+                stmt.dateType = dateTypeFromString(it.second["parseDateType"].as<r_string>());
+
+            statements[stmtName] = std::move(stmt);
         } else {
             statements[stmtName] = {it.second.as<r_string>()};
         }

src/config.h

@@ -19,8 +19,8 @@ ConfigDateType dateTypeFromString(std::string_view str);
 class ConfigStatement {
 public:
     r_string query;
-    bool parseTinyintAsBool = false;
-    ConfigDateType dateType = ConfigDateType::humanString;
+    std::optional<bool> parseTinyintAsBool;
+    std::optional<ConfigDateType> dateType;
 };
 
 
@@ -61,10 +61,31 @@ class Config : public intercept::singleton<Config> {
         return dateType;
     }
 
+    ConfigDateType getDateType(r_string statementName) const {
+        if (statementName.empty()) return dateType;
+        auto found = statements.find(statementName);
+        if (found == statements.end()) return dateType;
+        if (found->second.dateType)
+            return *found->second.dateType;
+
+        return dateType;
+    }
+
     bool getTinyintAsBool() const {
         return parseTinyintAsBool;
     }
 
+    bool getTinyintAsBool(r_string statementName) const {
+        if (statementName.empty()) return parseTinyintAsBool;
+        auto found = statements.find(statementName);
+        if (found == statements.end()) return parseTinyintAsBool;
+        if (found->second.parseTinyintAsBool)
+            return *found->second.parseTinyintAsBool;
+
+        return parseTinyintAsBool;
+    }
+
+
     static void initCommands();
     static inline registered_sqf_function handle_cmd_reloadConfig;
     static inline registered_sqf_function handle_cmd_version;

src/res.cpp

@@ -155,10 +155,8 @@ game_value Result::cmd_toArray(game_state&, game_value_parameter right) {
     if (!res) return auto_array<game_value>();
     auto_array<game_value> result;
 
-    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;
+    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(Config::get().getDateType(gdRes->statementName));
+    const auto parseTinyintAsBool =  Config::get().getTinyintAsBool(gdRes->statementName);
 
     while (res->next()) {
         auto_array<game_value> row;
@@ -212,10 +210,8 @@ game_value Result::cmd_toParsedArray(game_state& state, game_value_parameter rig
     if (!res) return auto_array<game_value>();
     auto_array<game_value> result;
 
-    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;
+    const auto [dateParser, dateTimeParser, timeParser] = getDateParser(Config::get().getDateType(gdRes->statementName));
+    const auto parseTinyintAsBool = Config::get().getTinyintAsBool(gdRes->statementName);
 
     while (res->next()) {
         auto_array<game_value> row;