Add support for nil parameters

package.json

@@ -12,10 +12,10 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@citizenfx/server": "^2.0.4376-1",
+    "@citizenfx/server": "^2.0.4780-1",
     "connection-string-parser": "^1.0.4",
     "github-version-checker": "^2.2.0",
-    "mysql2": "^2.3.0",
+    "mysql2": "https://github.com/overextended/node-mysql2.git",
     "postinstall-postinstall": "^2.1.0"
   },
   "devDependencies": {

patches/named-placeholders+1.1.2.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/named-placeholders/index.js b/node_modules/named-placeholders/index.js
-index 527d723..f47b591 100644
+index 527d723..e50595d 100644
 --- a/node_modules/named-placeholders/index.js
 +++ b/node_modules/named-placeholders/index.js
 @@ -3,7 +3,7 @@
@@ -11,23 +11,13 @@ index 527d723..f47b591 100644
  DQUOTE = 34,
  SQUOTE = 39,
  BSLASH = 92;
-@@ -94,15 +94,24 @@ function createCompiler(config) {
-     if (typeof params == 'undefined')
-       throw new Error('Named query contains placeholders, but parameters object is undefined');
+@@ -96,13 +96,13 @@ function createCompiler(config) {
 
-+    for(const key in params) {
-+      if(key.charAt(0) === '@' || key.charAt(0) === ':') {
-+        params[key.substring(1)] = params[key];
-+        delete params[key];
-+      }
-+    }
-+
      const tokens = tree[1];
      for (let i=0; i < tokens.length; ++i) {
-+      if(params[tokens[i]] === undefined) throw new Error(`Undefined parameter ${tokens[i]}`);
-       arr.push(params[tokens[i]]);
+-      arr.push(params[tokens[i]]);
++      arr.push(params[tokens[i]] === undefined ? null : params[tokens[i]]);
      }
-+
      return [tree[0], arr];
    }
 
@@ -37,7 +27,7 @@ index 527d723..f47b591 100644
        return s.slice(0, -1);
      }
      return s;
-@@ -115,7 +124,7 @@ function createCompiler(config) {
+@@ -115,7 +115,7 @@ function createCompiler(config) {
 
      let unnamed = noTailingSemicolon(tree[0][0]);
      for (let i=1; i < tree[0].length; ++i) {
@@ -46,7 +36,7 @@ index 527d723..f47b591 100644
          unnamed += config.placeholder;
        }
        unnamed += config.placeholder;
-@@ -124,7 +133,7 @@ function createCompiler(config) {
+@@ -124,7 +124,7 @@ function createCompiler(config) {
 
      const last = tree[0][tree[0].length -1];
      if (tree[0].length == tree[1].length) {

src/execute.js

@@ -5,21 +5,18 @@ import { slowQueryWarning, debug, resourceName } from './config';
 const execute = async (query, parameters, resource) => {
   ScheduleResourceTick(resourceName);
   try {
-    const time = debug ? process.hrtime.bigint() : Date.now();
 
     [query, parameters] = parseParameters(query, parameters);
 
-    const [result] = await pool.query(query, parameters);
-
-    const executionTime = debug ? Number(process.hrtime.bigint() - time) / 1e6 : Date.now() - time;
+    const [rows, _, executionTime] = await pool.query(query, parameters);
 
     if (executionTime >= slowQueryWarning || debug)
       console.log(
         `^3[${debug ? 'DEBUG' : 'WARNING'}] ${resource} took ${executionTime}ms to execute a query!
         ${query} ${JSON.stringify(parameters)}^0`
       );
 
-    return result;
+    return rows;
   } catch (error) {
     console.log(
       `^1[ERROR] ${resource} was unable to execute a query!

src/parser.js

@@ -1,7 +1,4 @@
 import { FormatError } from './errors';
-import * as createCompiler from 'named-placeholders';
-
-const convertNamedPlaceholders = createCompiler();
 
 const parseTypes = (field, next) => {
   //https://github.com/GHMatti/ghmattimysql/blob/37f1d2ae5c53f91782d168fe81fba80512d3c46d/packages/ghmattimysql/src/server/utility/typeCast.ts#L3
@@ -16,7 +13,7 @@ const parseTypes = (field, next) => {
         ? new Date(field.string() + ' 00:00:00').getTime()
         : new Date(field.string()).getTime();
     case 'TINY':
-      if (field.length === 1) return field.string() === '1';
+      if (field.length == 1) return field.string() === '1';
       else return next();
     case 'BIT':
       return field.buffer()[0] === 1;
@@ -37,16 +34,25 @@ const parseParameters = (query, parameters) => {
   if (queryParams === null) return [query, []];
 
   if (parameters === undefined)
-    throw new FormatError(`Placeholders was defined in query but no parameters provided!`, query);
+    throw new FormatError(`Placeholders were defined, but query received no parameters!`, query);
 
-  if (Array.isArray(parameters)) {
-    if (parameters.length !== queryParams.length)
-      throw new Error(`Undefined array parameter #${parameters.length + 1}`, query, parameters);
-  } else {
-    queryParams.forEach((_, i) => {
-      if (parameters[`${i + 1}`] === undefined)
-        throw new FormatError(`Undefined object parameter #${i + 1}`, query, parameters);
+  if (!Array.isArray(parameters)) {
+    let arr = [];
+    Object.entries(parameters).forEach((entry) => {
+      const [key, value] = entry;
+      arr[key - 1] = value;
     });
+    parameters = arr;
+  }
+  if (Array.isArray(parameters)) {
+    if (parameters.length === 0) {
+      for (let i = 0; i < queryParams.length; i++) parameters[i] = null;
+      return [query, parameters];
+    }
+    const diff = queryParams.length - parameters.length;
+    if (diff > 0) {
+      for (let i = 0; i < diff; i++) parameters[queryParams.length + i] = null;
+    }
   }
 
   return [query, parameters];

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@citizenfx/server@^2.0.4376-1":
-  version "2.0.4376-1"
-  resolved "https://registry.yarnpkg.com/@citizenfx/server/-/server-2.0.4376-1.tgz#6cc9e034bc463a031df40532f278b9f309b7f258"
-  integrity sha512-xIqpuSwbyga3ysSJ3NfiDeJ6+L3cEHI+vRF45IjMP3U0E4bMZLGrjoSXBbndDJjd97uPdak3HPZD4/AC0HBnIw==
+"@citizenfx/server@^2.0.4780-1":
+  version "2.0.4780-1"
+  resolved "https://registry.yarnpkg.com/@citizenfx/server/-/server-2.0.4780-1.tgz#be4164876bfb02ca1a487f159ba2aadd7dd9a3cd"
+  integrity sha512-1zsh/vb8bV9QP3JJ0xXtW84dG+JDVty3bB3dkujWi90q9ntef9EoE819JkRZph0kr83bYNjPQd9hkGctRAKjYw==
 
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.5"
@@ -42,9 +42,9 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
-  integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
+  version "7.28.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.1.tgz#50b07747f1f84c2ba8cd394cf0fe0ba07afce320"
+  integrity sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -336,9 +336,9 @@ [email protected]:
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 colorette@^2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.15.tgz#8e634aa0429b110d24be82eac4d42f5ea65ab2d5"
-  integrity sha512-lIFQhufWaVvwi4wOlX9Gx5b0Nmw3XAZ8HzHNH9dfxhe+JaKNTmX6QLk4o7UHyI+tUY8ClvyfaHUm5bf61O3psA==
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -395,10 +395,10 @@ cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-denque@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
-  integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
+denque@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a"
+  integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -408,9 +408,9 @@ dir-glob@^3.0.1:
     path-type "^4.0.0"
 
 electron-to-chromium@^1.3.857:
-  version "1.3.861"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz#981e37a79af7a7b29bbaeed36376f4795527de13"
-  integrity sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg==
+  version "1.3.866"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz#d446338f5ad6948b27a50739760e7b0b5cc5032f"
+  integrity sha512-iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA==
 
 enhanced-resolve@^5.8.3:
   version "5.8.3"
@@ -426,9 +426,9 @@ envinfo@^7.7.3:
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 es-module-lexer@^0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.2.tgz#d0a8c72c5d904014111fac7fab4c92b9ac545564"
-  integrity sha512-YkAGWqxZq2B4FxQ5y687UwywDwvLQhIMCZ+SDU7ZW729SDHOEI6wVFXwTRecz+yiwJzCsVwC6V7bxyNbZSB1rg==
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -654,7 +654,7 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@^0.6.2:
+iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -763,9 +763,9 @@ isobject@^3.0.1:
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 jest-worker@^27.0.6:
-  version "27.2.4"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.4.tgz#881455df75e22e7726a53f43703ab74d6b36f82d"
-  integrity sha512-Zq9A2Pw59KkVjBBKD1i3iE2e22oSjXhUKKuAK1HGX8flGwkm6NMozyEYzKd41hXc64dbd/0eWFeEEuxqXyhM+g==
+  version "27.2.5"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.5.tgz#ed42865661959488aa020e8a325df010597c36d4"
+  integrity sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
@@ -879,14 +879,13 @@ minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-mysql2@^2.3.0:
+"mysql2@https://github.com/overextended/node-mysql2.git":
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079"
-  integrity sha512-0t5Ivps5Tdy5YHk5NdKwQhe/4Qyn2pload+S+UooDBvsqngtzujG1BaTWBihQLfeKO3t3122/GtusBtmHEHqww==
+  resolved "https://github.com/overextended/node-mysql2.git#0bd156905d3093d33dddbde10adf1ca8ede18680"
   dependencies:
-    denque "^1.4.1"
+    denque "^2.0.1"
     generate-function "^2.3.1"
-    iconv-lite "^0.6.2"
+    iconv-lite "^0.6.3"
     long "^4.0.0"
     lru-cache "^6.0.0"
     named-placeholders "^1.1.2"
@@ -1351,9 +1350,9 @@ webpack-sources@^3.2.0:
   integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==
 
 webpack@^5.52.1:
-  version "5.58.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.58.0.tgz#9ec621cf8534f23c25e779e7c35dfde1211d5ccb"
-  integrity sha512-xc2k5MLbR1iah24Z5xUm1nBh1PZXEdUnrX6YkTSOScq/VWbl5JCLREXJzGYqEAUbIO8tZI+Dzv82lGtnuUnVCQ==
+  version "5.58.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.58.1.tgz#df8aad72b617a9d0db8c89d4f410784ee93320d7"
+  integrity sha512-4Z/dmbTU+VmkCb2XNgW7wkE5TfEcSooclprn/UEuVeAkwHhn07OcgUsyaKHGtCY/VobjnsYBlyhKeMLiSoOqPg==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.50"