fix(db): parseArguments during try block

Error catching when unexpected data is passed to query string.
overextended · Dec 28, 2021 · 47a33bb · 47a33bb
1 parent d54bcae
commit 47a33bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/server/db/query.js b/src/server/db/query.js
@@ -4,12 +4,12 @@ import pool from './pool.js';
 
 export default async (type, invokingResource, query, parameters, cb) => {
   if (!isReady) serverReady();
-
-  [query, parameters, cb] = parseArguments(invokingResource, query, parameters, cb);
-  scheduleTick();
   let result, executionTime;
 
   try {
+    [query, parameters, cb] = parseArguments(invokingResource, query, parameters, cb);
+    scheduleTick();
+
     [result, _, executionTime] = await pool.query(query, parameters);
 
     if (executionTime >= mysql_slow_query_warning || mysql_debug)

diff --git a/src/server/db/transaction.js b/src/server/db/transaction.js
@@ -12,13 +12,12 @@ const transactionError = (queries, parameters) =>
 
 export default async (invokingResource, queries, parameters, cb) => {
   if (!isReady) serverReady();
-
-  const parsedQuery = parseTransaction(invokingResource, queries, parameters);
   scheduleTick();
   const connection = await pool.getConnection();
   let result;
 
   try {
+    const parsedQuery = parseTransaction(invokingResource, queries, parameters);
     let queryCount = parsedQuery.length;
     let executionTime = hrtime();