fix(utils): convertNamedPlaceholders requires parameters

Resolves unexpected behaviour when resources send concatenated queries containing : and @

i.e. esx_status case query

fxmanifest.lua

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

src/server/utils.js

@@ -33,9 +33,12 @@ export let serverReady = async () => {
 export const parseArguments = (invokingResource, query, parameters, cb) => {
   if (typeof query !== 'string') throw new Error(`Query expected a string but received ${typeof query} instead`);
 
-  const queryParams = query.match(/\?(?!\?)/g);
-
-  if (query.includes(':') || query.includes('@')) {
+  if (
+    parameters &&
+    typeof parameters === 'object' &&
+    !Array.isArray(parameters) &&
+    (query.includes(':') || query.includes('@'))
+  ) {
     const placeholders = convertNamedPlaceholders(query, parameters);
     query = placeholders[0];
     parameters = placeholders[1];
@@ -57,19 +60,23 @@ export const parseArguments = (invokingResource, query, parameters, cb) => {
       arr[key - 1] = value;
     });
     parameters = arr;
-  } else if (queryParams !== null) {
-    if (parameters.length === 0) {
-      for (let i = 0; i < queryParams.length; i++) parameters[i] = null;
-      return [query, parameters, cb];
-    }
-    const diff = queryParams.length - parameters.length;
-
-    if (diff > 0) {
-      for (let i = 0; i < diff; i++) parameters[queryParams.length + i] = null;
-    } else if (diff < 0) {
-      throw new Error(`${invokingResource} was unable to execute a query!
-        Expected ${queryParams.length} parameters, but received ${parameters.length}.
-        ${`${query} ${JSON.stringify(parameters)}`}`);
+  } else {
+    const queryParams = query.match(/\?(?!\?)/g);
+
+    if (queryParams !== null) {
+      if (parameters.length === 0) {
+        for (let i = 0; i < queryParams.length; i++) parameters[i] = null;
+        return [query, parameters, cb];
+      }
+      const diff = queryParams.length - parameters.length;
+
+      if (diff > 0) {
+        for (let i = 0; i < diff; i++) parameters[queryParams.length + i] = null;
+      } else if (diff < 0) {
+        throw new Error(`${invokingResource} was unable to execute a query!
+          Expected ${queryParams.length} parameters, but received ${parameters.length}.
+          ${`${query} ${JSON.stringify(parameters)}`}`);
+      }
     }
   }