refactor: error handling

Meant to push this before release.
Ensures errors are handled as before, regardless of using exports
or lib/mysql; for compatibility.

Author: thelindat

fxmanifest.lua

@@ -3,7 +3,7 @@ game 'common'
 
 name 'oxmysql'
 description 'Database wrapper for FiveM utilising node-mysql2 offering improved performance and security.'
-version '2.3.2'
+version '2.3.3'
 url 'https://github.com/overextended/oxmysql'
 author 'overextended'
 

lib/MySQL.lua

@@ -74,7 +74,7 @@ local function await(fn, query, parameters)
 		end
 
 		p:resolve(result)
-	end, GetCurrentResourceName, false)
+	end, GetCurrentResourceName, true)
 	return Await(p)
 end
 
@@ -86,7 +86,7 @@ setmetatable(MySQL, {
 
 				__call = function(_, query, parameters, cb)
 					query, parameters, cb = safeArgs(query, parameters, cb, method == 'transaction')
-					return oxmysql[method](nil, query, parameters, cb, GetCurrentResourceName, true)
+					return oxmysql[method](nil, query, parameters, cb, GetCurrentResourceName, false)
 				end,
 
 				__index = function(_, index)

src/database/rawExecute.ts

@@ -77,7 +77,7 @@ export const rawExecute = async (
     .catch((err) => {
       const error = `${invokingResource} was unable to execute a query!\n${err}\n${`${query}`}`;
 
-      if (cb && !throwError) cb(null, error);
-      if (throwError || !cb) throw new Error(error);
+      if (cb && throwError) return cb(null, error);
+    throw new Error(error);
     });
 };

src/database/rawQuery.ts

@@ -30,7 +30,7 @@ export const rawQuery = async (
   }).catch((err) => {
     const error = `${invokingResource} was unable to execute a query!\n${err.message}\n${`${query} ${JSON.stringify(parameters)}`}`
 
-    if (cb && !throwError) cb(null, error);
-    if (throwError || !cb) throw new Error(error);
+    if (cb && throwError) return cb(null, error);
+    throw new Error(error);
   });
 };