avoid doubly throwing the error

Author: GHMatti

mysql-async.js

@@ -5100,15 +5100,15 @@ global.exports('mysql_execute', (query, parameters, callback) => {
   const sql = prepareQuery(query, parameters);
   mysql.execute({ sql, typeCast }, invokingResource).then((result) => {
     safeInvoke(callback, (result) ? result.affectedRows : 0);
-  });
+  }).catch(() => {});
 });
 
 global.exports('mysql_fetch_all', (query, parameters, callback) => {
   const invokingResource = global.GetInvokingResource();
   const sql = prepareQuery(query, parameters);
   mysql.execute({ sql, typeCast }, invokingResource).then((result) => {
     safeInvoke(callback, result);
-  });
+  }).catch(() => {});
 });
 
 global.exports('mysql_fetch_scalar', (query, parameters, callback) => {
@@ -5124,10 +5124,12 @@ global.exports('mysql_insert', (query, parameters, callback) => {
   const sql = prepareQuery(query, parameters);
   mysql.execute({ sql, typeCast }, invokingResource).then((result) => {
     safeInvoke(callback, (result) ? result.insertId : 0);
-  });
+  }).catch(() => {});
 });
 
 let isReady = false;
+global.exports('is_ready', () => isReady);
+
 global.on('onServerResourceStart', (resourcename) => {
   if (resourcename === 'mysql-async') {
     const trace = global.GetConvarInt('mysql_debug', 0);
@@ -5140,16 +5142,13 @@ global.on('onServerResourceStart', (resourcename) => {
     const connectionString = global.GetConvar('mysql_connection_string', 'Empty');
     if (connectionString === 'Empty') {
       logger.error('Empty mysql_connection_string detected.');
-      throw new Error('Empty mysql_connection_string detected.');
-    }
-    config = parseSettings(connectionString);
+    } else {
+      config = parseSettings(connectionString);
 
-    mysql = new MySQL(config, logger, profiler);
-    global.emit('onMySQLReady'); // avoid ESX bugs
-    isReady = true;
-  }
-  if (isReady) {
-    global.emit('MySQLReady'); // avoid ESX bugs
+      mysql = new MySQL(config, logger, profiler);
+      global.emit('onMySQLReady'); // avoid old ESX bugs
+      isReady = true;
+    }
   }
 });
 
@@ -5222,9 +5221,7 @@ class MySQL {
         if (error) reject(error);
         resolve(result);
       });
-    });
-
-    queryPromise.catch((error) => {
+    }).catch((error) => {
       this.logger.error(`[ERROR] [MySQL] [${invokingResource}] An error happens on MySQL for query "${sql.sql}": ${error.message}`);
     });
 

src/server/mysql.js

@@ -53,9 +53,7 @@ class MySQL {
         if (error) reject(error);
         resolve(result);
       });
-    });
-
-    queryPromise.catch((error) => {
+    }).catch((error) => {
       this.logger.error(`[ERROR] [MySQL] [${invokingResource}] An error happens on MySQL for query "${sql.sql}": ${error.message}`);
     });