pqb 0.15.0 → 0.15.1

package/dist/index.js

@@ -7062,7 +7062,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         error.cause = localError;
       }
     }
-    if (query.log && sql && logData) {
+    if (query.log && sql) {
       query.log.onError(error, sql, logData);
     }
     return reject == null ? void 0 : reject(error);
@@ -8910,21 +8910,35 @@ class Db {
     return performQuery(this, args, "arrays");
   }
 }
-const performQuery = (q2, args, method) => {
+const performQuery = async (q2, args, method) => {
   const trx = q2.internal.transactionStorage.getStore();
-  let input;
+  let sql;
   if (typeof args[0].raw === "string") {
-    input = { text: args[0].raw, values: args[0].values };
+    sql = { text: args[0].raw, values: args[0].values };
   } else {
     const values = [];
-    input = {
+    sql = {
       text: templateLiteralToSQL(args, values),
       values
     };
   }
-  return ((trx == null ? void 0 : trx.adapter) || q2.adapter)[method](
-    input
-  );
+  const { log } = q2.q;
+  let logData;
+  if (log)
+    logData = log.beforeQuery(sql);
+  try {
+    const result = await ((trx == null ? void 0 : trx.adapter) || q2.adapter)[method](
+      sql
+    );
+    if (log)
+      log.afterQuery(sql, logData);
+    return result;
+  } catch (err) {
+    if (log) {
+      log.onError(err, sql, logData);
+    }
+    throw err;
+  }
 };
 orchidCore.applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;