Added dbAddErrorHandler

Author: dedmen

src/connection.cpp

@@ -157,7 +157,7 @@ game_value Connection::cmd_execute(game_state& gs, game_value_parameter con, gam
         }
 
         auto res = statement->query();
-
+        //#TODO handle error in create_statement and in query()
         auto gd_res = new GameDataDBResult();
         gd_res->res = res;
 
@@ -190,9 +190,18 @@ game_value Connection::cmd_execute(game_state& gs, game_value_parameter con, gam
             return true;
         }
         catch (mariadb::exception::connection& x) {
-            auto exText = r_string("Intercept-DB exception ") + x.what() + "\nat\n" + stmt;
-            invoker_lock l();
-            sqf::diag_log(exText);
+            invoker_lock l;
+            if (con->account()->hasErrorHandler()) {
+                for (auto& it : con->account()->getErrorHandlers()) {
+
+                    auto res = sqf::call(it, { static_cast<r_string>(x.what()), static_cast<size_t>(x.error_id()), stmt });
+
+                    if (res.type_enum() == game_data_type::BOOL && static_cast<bool>(res)) break; //If returned true then error was handled.
+                }
+            } else {
+                auto exText = r_string("Intercept-DB exception ") + x.what() + "\nat\n" + stmt;
+                sqf::diag_log(exText);
+            }
 
             return false;
         }
@@ -236,9 +245,20 @@ game_value Connection::cmd_executeAsync(game_state&, game_value_parameter con, g
             __itt_task_end(domainConnection);
             return true;
         } catch (mariadb::exception::connection& x) {
-            auto exText = r_string("Intercept-DB exception ") + x.what() + "\nat\n" + stmt;
-            invoker_lock l();
-            sqf::diag_log(exText);
+            invoker_lock l;
+            if (con->account()->hasErrorHandler()) {
+                for (auto& it : con->account()->getErrorHandlers()) {
+                    
+                    auto res = sqf::call(it, { static_cast<r_string>(x.what()), static_cast<size_t>(x.error_id()), stmt });
+
+                    if (res.type_enum() == game_data_type::BOOL && static_cast<bool>(res)) break; //If returned true then error was handled.
+                }
+            } else {
+                auto exText = r_string("Intercept-DB exception ") + x.what() + "\nat\n" + stmt;
+                sqf::diag_log(exText);
+            }
+
+            
 
             __itt_task_end(domainConnection);
             return false;
@@ -265,6 +285,14 @@ game_value Connection::cmd_isConnected(game_state&, game_value_parameter con) {
     return session && (session->connected() || Threading::get().isConnected(session->account()));
 }
 
+game_value Connection::cmd_addErrorHandler(game_state&, game_value_parameter con, game_value_parameter handler) {
+    auto session = con.get_as<GameDataDBConnection>()->session;
+    if (!session) return {};
+
+    session->account()->addErrorHandler(handler);
+    return {};
+}
+
 void Connection::initCommands() {
 
     auto dbType = host::register_sqf_type("DBCON"sv, "databaseConnection"sv, "TODO"sv, "databaseConnection"sv, createGameDataDBConnection);
@@ -276,6 +304,10 @@ void Connection::initCommands() {
     handle_cmd_createConnectionConfig = host::register_sqf_command("dbCreateConnection", "TODO", Connection::cmd_createConnectionConfig, GameDataDBConnection_typeE, game_data_type::STRING);
     handle_cmd_execute = host::register_sqf_command("dbExecute", "TODO", Connection::cmd_execute, Result::GameDataDBResult_typeE, GameDataDBConnection_typeE, Query::GameDataDBQuery_typeE);
     handle_cmd_executeAsync = host::register_sqf_command("dbExecuteAsync", "TODO", Connection::cmd_executeAsync, Result::GameDataDBAsyncResult_typeE, GameDataDBConnection_typeE, Query::GameDataDBQuery_typeE);
-    handle_cmd_ping = host::register_sqf_command("dbPing", "TODO", Connection::cmd_ping, game_data_type::ARRAY, GameDataDBConnection_typeE);
-    handle_cmd_isConnected = host::register_sqf_command("dbIsConnected", "TODO", Connection::cmd_isConnected, game_data_type::ARRAY, GameDataDBConnection_typeE);
+    handle_cmd_ping = host::register_sqf_command("dbPing", "TODO", Connection::cmd_ping, game_data_type::BOOL, GameDataDBConnection_typeE);
+    handle_cmd_isConnected = host::register_sqf_command("dbIsConnected", "TODO", Connection::cmd_isConnected, game_data_type::BOOL, GameDataDBConnection_typeE);
+    handle_cmd_addErrorHandler = host::register_sqf_command("dbIsConnected", "TODO", Connection::cmd_addErrorHandler, game_data_type::ARRAY, GameDataDBConnection_typeE, game_data_type::CODE);
+
+
+
 }

src/connection.h

@@ -14,7 +14,7 @@ class Connection {
     static game_value cmd_executeAsync(game_state&, game_value_parameter con, game_value_parameter qu);
     static game_value cmd_ping(game_state&, game_value_parameter con);
     static game_value cmd_isConnected(game_state&, game_value_parameter con);
-
+    static game_value cmd_addErrorHandler(game_state&, game_value_parameter con, game_value_parameter handler);
 
 
 
@@ -29,4 +29,5 @@ class Connection {
     static inline types::registered_sqf_function handle_cmd_executeAsync;
     static inline types::registered_sqf_function handle_cmd_ping;
     static inline types::registered_sqf_function handle_cmd_isConnected;
+    static inline types::registered_sqf_function handle_cmd_addErrorHandler;
 };

src/main.cpp

@@ -58,7 +58,7 @@ void intercept::on_frame() {
     for (auto& it : Threading::get().completedAsyncTasks) {
         __itt_task_begin(domainMain, __itt_null, __itt_null, main_on_frame_callback);
 
-        if (!it->data->callback.is_nil()) {
+        if (!it->data->callback.is_nil() && it->data->res) {
             logMessageWithTime("task callback");
             auto gd_res = new GameDataDBResult();
             gd_res->res = it->data->res;

src/res.cpp

@@ -39,7 +39,6 @@ game_value Result::cmd_toArray(game_state&, game_value_parameter right) {
         auto_array<game_value> row;
 
         for (size_t i = 0u; i < res->column_count(); ++i) {
-
             switch (res->column_type(i)) {
                 case mariadb::value::null: row.emplace_back(game_value{}); break;
                 case mariadb::value::date: row.emplace_back(res->get_date(i).str()); break;
@@ -60,7 +59,7 @@ game_value Result::cmd_toArray(game_state&, game_value_parameter right) {
                 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));
     }