refactor(execute): use transactions and parse values

Parse each value while iterating prepared statements, ensuring
objects are remapped to arrays and NULL values are properly
inserted.

Utilise transactions to rollback changes in the event of an error.

Author: thelindat

src/database/rawExecute.ts

@@ -3,7 +3,7 @@ import { pool } from '.';
 import { logQuery } from '../logger';
 import { CFXCallback, CFXParameters, QueryResponse } from '../types';
 import { parseResponse } from '../utils/parseResponse';
-import { executeType, parseExecute } from '../utils/parseExecute';
+import { executeType, parseExecute, parseValues } from '../utils/parseExecute';
 import { scheduleTick } from '../utils/scheduleTick';
 
 export const rawExecute = async (
@@ -24,10 +24,14 @@ export const rawExecute = async (
   let response: QueryResponse;
 
   try {
+    const placeholders = query.split('?').length - 1;
     const results = [] as RowDataPacket;
     const executionTime = process.hrtime();
 
-    for (const values of parameters) {
+    await connection.beginTransaction();
+
+    parameters.forEach(async (values: any) => {
+      values = parseValues(placeholders, values);
       const [rows] = (await connection.execute(query, values)) as RowDataPacket[][];
       if (rows.length > 1) {
         for (const row of rows) {
@@ -36,7 +40,7 @@ export const rawExecute = async (
       } else results.push(parseResponse(type, rows));
 
       logQuery(invokingResource, query, process.hrtime(executionTime)[1] / 1e6, values as typeof parameters);
-    }
+    });
 
     response = results;
 
@@ -50,10 +54,14 @@ export const rawExecute = async (
     } else {
       response = results;
     }
+
+    await connection.commit();
   } catch (e) {
+    await connection.rollback();
+
     throw new Error(`${invokingResource} was unable to execute a query!
     ${(e as QueryError).message}
-    ${`${query} ${JSON.stringify(parameters)}`}`);
+    ${`${(e as any).sql}`}`);
   } finally {
     connection.release();
   }

src/database/rawQuery.ts

@@ -16,6 +16,7 @@ export const rawQuery = async (
   await scheduleTick();
   [query, parameters, cb] = parseArguments(invokingResource, query, parameters, cb);
 
+  //@ts-ignore TODO: patch mysql2 type
   pool.query(query, parameters, (err, result, _, executionTime) => {
     logQuery(invokingResource, query, executionTime, parameters);
     if (err)

src/utils/parseExecute.ts

@@ -16,14 +16,31 @@ export const executeType = (query: string) => {
 };
 
 export const parseExecute = (parameters: CFXParameters | CFXParameters[]) => {
-  if (!Array.isArray(parameters))
+  if (!Array.isArray(parameters)) {
     if (typeof parameters === 'object') {
       const arr: unknown[] = [];
       Object.entries(parameters).forEach((entry) => (arr[parseInt(entry[0]) - 1] = entry[1]));
       parameters = arr;
     } else throw new Error(`Parameters expected an array but received ${typeof parameters} instead`);
+  }
 
   if (!parameters.every(Array.isArray)) parameters = [[...parameters]];
 
   return parameters;
 };
+
+export const parseValues = (placeholders: number, parameters: CFXParameters | CFXParameters[]) => {
+  if (!Array.isArray(parameters)) {
+    if (typeof parameters === 'object') {
+      const arr: unknown[] = [];
+      Object.entries(parameters).forEach((entry) => (arr[parseInt(entry[0]) - 1] = entry[1]));
+      parameters = arr;
+    } else throw new Error(`Parameters expected an array but received ${typeof parameters} instead`);
+  } else if (placeholders > parameters.length) {
+    for (let i = parameters.length; i < placeholders; i++) {
+      parameters[i] = null;
+    }
+  }
+
+  return parameters;
+};