fix: don't throw errors outside of promises

Author: thelindat

src/database/rawExecute.ts

@@ -12,7 +12,7 @@ export const rawExecute = (
   query: string,
   parameters: CFXParameters,
   cb?: CFXCallback,
-  throwError?: boolean,
+  isPromise?: boolean,
   unpack?: boolean
 ) => {
   if (typeof query !== 'string')
@@ -104,7 +104,7 @@ export const rawExecute = (
         resource: invokingResource,
       });
 
-      if (cb && throwError) return cb(null, error);
-      throw new Error(error);
+      if (cb && isPromise) return cb(null, error);
+      console.error(error);
     });
 };

src/database/rawQuery.ts

@@ -12,7 +12,7 @@ export const rawQuery = (
   query: string,
   parameters: CFXParameters,
   cb?: CFXCallback,
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
   if (typeof query !== 'string')
     throw new Error(
@@ -56,7 +56,7 @@ export const rawQuery = (
         resource: invokingResource,
       });
 
-      if (cb && throwError) return cb(null, error);
-      throw new Error(error);
+      if (cb && isPromise) return cb(null, error);
+      console.error(error);
     });
 };

src/index.ts

@@ -21,49 +21,49 @@ MySQL.query = (
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawQuery(null, invokingResource, query, parameters, cb, throwError);
+  rawQuery(null, invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.single = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawQuery('single', invokingResource, query, parameters, cb, throwError);
+  rawQuery('single', invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.scalar = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawQuery('scalar', invokingResource, query, parameters, cb, throwError);
+  rawQuery('scalar', invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.update = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawQuery('update', invokingResource, query, parameters, cb, throwError);
+  rawQuery('update', invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.insert = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawQuery('insert', invokingResource, query, parameters, cb, throwError);
+  rawQuery('insert', invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.transaction = (
@@ -80,19 +80,19 @@ MySQL.prepare = (
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawExecute(invokingResource, query, parameters, cb, throwError, true);
+  rawExecute(invokingResource, query, parameters, cb, isPromise, true);
 };
 
 MySQL.rawExecute = (
   query: string,
   parameters: CFXParameters,
   cb: CFXCallback,
   invokingResource = GetInvokingResource(),
-  throwError?: boolean
+  isPromise?: boolean
 ) => {
-  rawExecute(invokingResource, query, parameters, cb, throwError);
+  rawExecute(invokingResource, query, parameters, cb, isPromise);
 };
 
 MySQL.execute = MySQL.query;