pqb 0.57.4 → 0.57.5

package/dist/index.d.ts

@@ -1738,8 +1738,8 @@ interface AdapterBase {
     getSchema(): string | undefined;
     getHost(): string;
     connect?(): Promise<unknown>;
-    query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[]): Promise<QueryResult<T>>;
-    arrays<R extends any[] = any[]>(text: string, values?: unknown[]): Promise<QueryArraysResult<R>>;
+    query<T extends QueryResultRow = QueryResultRow>(text: string, values?: unknown[], catchingSavepoint?: string): Promise<QueryResult<T>>;
+    arrays<R extends any[] = any[]>(text: string, values?: unknown[], catchingSavepoint?: string): Promise<QueryArraysResult<R>>;
     /**
      * Run a transaction
      *
@@ -1755,6 +1755,7 @@ interface TransactionState {
     afterCommit?: TransactionAfterCommitHook[];
     log?: QueryLogObject;
     testTransactionCount?: number;
+    catchI?: number;
 }
 /**
  * Element of `afterCommit` transaction array. See {@link TransactionState.afterCommit}.
@@ -2078,6 +2079,7 @@ interface QueryData extends QueryDataBase {
     shape: ColumnsShape;
     patchResult?(q: Query, hookSelect: HookSelect | undefined, queryResult: QueryResult): Promise<void>;
     handleResult: HandleResult;
+    catch?: boolean;
     returnType: QueryReturnType;
     returning?: boolean;
     returningMany?: boolean;
@@ -7349,7 +7351,9 @@ declare const queryMethodByReturnType: {
     [K in string]: 'query' | 'arrays';
 };
 interface QueryCatchers {
-    catchUniqueError<T>(this: T, fn: (reason: QueryError) => unknown): T;
+    catchUniqueError<ThenResult, CatchResult>(this: {
+        then: (onfulfilled?: (value: ThenResult) => any) => any;
+    }, fn: (reason: QueryError) => CatchResult): Promise<ThenResult | CatchResult>;
 }
 declare class Then implements QueryCatchers {
     catch(this: Query, fn: (reason: any) => unknown): Promise<unknown>;

package/dist/index.js

@@ -3620,11 +3620,11 @@ const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 function simpleColumnToSQL(ctx, key, column, quotedAs) {
   if (!column) return `"${key}"`;
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? `(${data.computed.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? `(${data.computed.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   const index = column.indexOf(".");
@@ -3679,7 +3679,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
       return `"${tableName}"."${col.data.name}"`;
     }
     if (col.data.computed) {
-      return col.data.computed.toSQL(ctx, quoted);
+      return `(${col.data.computed.toSQL(ctx, quoted)})`;
     }
     return `"${tableName}"."${key}"`;
   }
@@ -3719,7 +3719,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
       return `"${tableName}"."${col.data.name}" "${as}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)} "${as}"`;
+      return `(${col.data.computed.toSQL(ctx, quoted)}) "${as}"`;
     }
   }
   return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
@@ -3732,7 +3732,7 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList)
       return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quotedAs)} "${as}"`;
+      return `(${col.data.computed.toSQL(ctx, quotedAs)}) "${as}"`;
     }
   }
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
@@ -4247,7 +4247,8 @@ const skipQueryKeysForSubQuery = {
   catchAfterCommitErrors: true,
   log: true,
   logger: true,
-  autoPreparedStatements: true
+  autoPreparedStatements: true,
+  catch: true
 };
 const getIsJoinSubQuery = (query) => {
   const {
@@ -6169,12 +6170,16 @@ const queryMethodByReturnType = {
 class Then {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   catch(fn) {
-    return this.then(void 0, fn);
+    const q = _clone(this);
+    q.q.catch = true;
+    return q.then(void 0, fn);
   }
   catchUniqueError(fn) {
-    return this.then(void 0, (err) => {
+    const q = _clone(this);
+    q.q.catch = true;
+    return q.then(void 0, (err) => {
       if (err instanceof QueryError && err.isUnique) {
-        fn(err);
+        return fn(err);
       } else {
         throw err;
       }
@@ -6197,6 +6202,7 @@ Object.defineProperty(Then.prototype, "then", {
 });
 function maybeWrappedThen(resolve, reject) {
   const { q } = this;
+  const shouldCatch = q.catch || !!reject;
   let beforeHooks;
   let afterHooks;
   let afterCommitHooks;
@@ -6228,7 +6234,8 @@ function maybeWrappedThen(resolve, reject) {
           afterHooks,
           afterCommitHooks,
           resolve2,
-          reject2
+          reject2,
+          shouldCatch
         );
       })
     ).then(resolve, reject);
@@ -6241,7 +6248,8 @@ function maybeWrappedThen(resolve, reject) {
       afterHooks,
       afterCommitHooks,
       resolve,
-      reject
+      reject,
+      shouldCatch
     );
   }
 }
@@ -6251,7 +6259,7 @@ const callAfterHook = function(cb) {
   return cb(this[0], this[1]);
 };
 const beginSql = { text: "BEGIN" };
-const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
+const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject, shouldCatch) => {
   var _a;
   const { q: query } = q;
   let sql;
@@ -6284,7 +6292,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       queryResult = await execQuery(
         adapter,
         queryMethodByReturnType[tempReturnType],
-        sql
+        sql,
+        shouldCatch && trx
       );
       if (log) {
         log.afterQuery(sql, logData);
@@ -6314,7 +6323,12 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
           if (log) {
             logData = log.beforeQuery(sql);
           }
-          const result2 = await execQuery(adapter, queryMethod, sql);
+          const result2 = await execQuery(
+            adapter,
+            queryMethod,
+            sql,
+            shouldCatch && trx
+          );
           if (queryResult) {
             queryResult.rowCount += result2.rowCount;
             queryResult.rows.push(...result2.rows);
@@ -6586,8 +6600,13 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     throw error;
   }
 };
-const execQuery = (adapter, method, sql) => {
-  return adapter[method](sql.text, sql.values).then((result) => {
+const execQuery = (adapter, method, sql, catchTrx) => {
+  const catchingSavepoint = catchTrx ? String(catchTrx.catchI = (catchTrx.catchI || 0) + 1) : void 0;
+  return adapter[method](
+    sql.text,
+    sql.values,
+    catchingSavepoint
+  ).then((result) => {
     if (result.rowCount && !result.rows.length) {
       result.rows.length = result.rowCount;
       result.rows.fill({});