pqb 0.39.1 → 0.39.3

package/dist/index.js

@@ -119,25 +119,25 @@ const sqlFn = (...args) => {
   return (...args2) => new RawSQL(args2, arg);
 };
 
-var __defProp$l = Object.defineProperty;
-var __defProps$b = Object.defineProperties;
-var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$l = (a, b) => {
+var __defProp$m = Object.defineProperty;
+var __defProps$d = Object.defineProperties;
+var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
+var __hasOwnProp$n = Object.prototype.hasOwnProperty;
+var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$m = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$m.call(b, prop))
-      __defNormalProp$l(a, prop, b[prop]);
-  if (__getOwnPropSymbols$m)
-    for (var prop of __getOwnPropSymbols$m(b)) {
-      if (__propIsEnum$m.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
+    if (__hasOwnProp$n.call(b, prop))
+      __defNormalProp$m(a, prop, b[prop]);
+  if (__getOwnPropSymbols$n)
+    for (var prop of __getOwnPropSymbols$n(b)) {
+      if (__propIsEnum$n.call(b, prop))
+        __defNormalProp$m(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
 class ColumnType extends orchidCore.ColumnTypeBase {
   /**
    * Mark the column as a primary key.
@@ -336,13 +336,13 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    */
   searchIndex(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadValues$l(__spreadValues$l({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      options: __spreadValues$m(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
   unique(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadProps$b(__spreadValues$l({}, typeof args[0] === "string" ? args[1] : args[0]), {
+      options: __spreadProps$d(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), {
         unique: true
       }),
       name: typeof args[0] === "string" ? args[0] : void 0
@@ -385,25 +385,25 @@ class ColumnType extends orchidCore.ColumnTypeBase {
   }
 }
 
-var __defProp$k = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$k = (a, b) => {
+var __defProp$l = Object.defineProperty;
+var __defProps$c = Object.defineProperties;
+var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
+var __hasOwnProp$m = Object.prototype.hasOwnProperty;
+var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$l = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$l.call(b, prop))
-      __defNormalProp$k(a, prop, b[prop]);
-  if (__getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(b)) {
-      if (__propIsEnum$l.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
+    if (__hasOwnProp$m.call(b, prop))
+      __defNormalProp$l(a, prop, b[prop]);
+  if (__getOwnPropSymbols$m)
+    for (var prop of __getOwnPropSymbols$m(b)) {
+      if (__propIsEnum$m.call(b, prop))
+        __defNormalProp$l(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
 const knownDefaults = {
   current_timestamp: "now()",
   "transaction_timestamp()": "now()"
@@ -419,7 +419,7 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$a(__spreadValues$k({}, params), {
+  Object.assign(column.data, __spreadProps$c(__spreadValues$l({}, params), {
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
@@ -858,25 +858,25 @@ const getSqlText = (sql) => {
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
-var __defProp$j = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$j = (a, b) => {
+var __defProp$k = Object.defineProperty;
+var __defProps$b = Object.defineProperties;
+var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
+var __hasOwnProp$l = Object.prototype.hasOwnProperty;
+var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$k = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$k.call(b, prop))
-      __defNormalProp$j(a, prop, b[prop]);
-  if (__getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(b)) {
-      if (__propIsEnum$k.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
+    if (__hasOwnProp$l.call(b, prop))
+      __defNormalProp$k(a, prop, b[prop]);
+  if (__getOwnPropSymbols$l)
+    for (var prop of __getOwnPropSymbols$l(b)) {
+      if (__propIsEnum$l.call(b, prop))
+        __defNormalProp$k(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
 function setQueryOperators(query, operators) {
   const q = query.q;
   if (q.operators !== operators) {
@@ -965,7 +965,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$9(__spreadValues$j({}, base), {
+const boolean = __spreadProps$b(__spreadValues$k({}, base), {
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
@@ -973,7 +973,7 @@ const boolean = __spreadProps$9(__spreadValues$j({}, base), {
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
 });
-const numeric = __spreadProps$9(__spreadValues$j({}, base), {
+const numeric = __spreadProps$b(__spreadValues$k({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue$1(value, ctx, quotedAs)}`
   ),
@@ -994,7 +994,7 @@ const numeric = __spreadProps$9(__spreadValues$j({}, base), {
     )}`
   )
 });
-const text = __spreadProps$9(__spreadValues$j({}, base), {
+const text = __spreadProps$b(__spreadValues$k({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -1016,7 +1016,7 @@ const text = __spreadProps$9(__spreadValues$j({}, base), {
 });
 const encodeJsonPath = (ctx, path) => orchidCore.addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${orchidCore.addValue(ctx.values, path)}${(options == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
-const json = __spreadProps$9(__spreadValues$j({}, base), {
+const json = __spreadProps$b(__spreadValues$k({}, base), {
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
       var _a, _b, _c, _d, _e;
@@ -1266,25 +1266,25 @@ class BigSerialColumn extends NumberAsStringBaseColumn {
   }
 }
 
-var __defProp$i = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$i = (a, b) => {
+var __defProp$j = Object.defineProperty;
+var __defProps$a = Object.defineProperties;
+var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
+var __hasOwnProp$k = Object.prototype.hasOwnProperty;
+var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$j = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$j.call(b, prop))
-      __defNormalProp$i(a, prop, b[prop]);
-  if (__getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(b)) {
-      if (__propIsEnum$j.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
+    if (__hasOwnProp$k.call(b, prop))
+      __defNormalProp$j(a, prop, b[prop]);
+  if (__getOwnPropSymbols$k)
+    for (var prop of __getOwnPropSymbols$k(b)) {
+      if (__propIsEnum$k.call(b, prop))
+        __defNormalProp$j(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 class TextBaseColumn extends ColumnType {
   constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
@@ -1338,7 +1338,7 @@ class StringColumn extends VarCharColumn {
   }
 }
 const textColumnToCode = (column, ctx, key) => {
-  const data = __spreadValues$i({}, column.data);
+  const data = __spreadValues$j({}, column.data);
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
   if (data.minArg !== void 0 && data.min === data.minArg || hasMax) {
@@ -1642,7 +1642,7 @@ class UUIDColumn extends ColumnType {
       key,
       `uuid()`,
       // don't output the default default
-      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$8(__spreadValues$i({}, data), { default: void 0 }) : data
+      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$a(__spreadValues$j({}, data), { default: void 0 }) : data
     );
   }
 }
@@ -1868,15 +1868,22 @@ const queryTypeWithLimitOne = {
 };
 const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 
-function simpleColumnToSQL(ctx, key, column, quotedAs) {
+const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
+  var _a;
+  const parser = computed.result.value.parseFn;
+  if (parser)
+    ((_a = q.parsers) != null ? _a : q.parsers = {})[as] = parser;
+  return computed.toSQL(ctx, quotedAs);
+};
+function simpleColumnToSQL(ctx, q, 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 ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
-function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
+function simpleExistingColumnToSQL(ctx, q, key, column, quotedAs) {
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   var _a;
@@ -1895,7 +1902,7 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
     return `"${column}".r`;
   }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+  return simpleColumnToSQL(ctx, data, column, shape[column], quotedAs);
 };
 const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
   var _a;
@@ -1910,12 +1917,12 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
       for (const s of data.select) {
         if (typeof s === "object" && "selectAs" in s) {
           if (column in s.selectAs) {
-            return simpleColumnToSQL(ctx, column, data.shape[column]);
+            return simpleColumnToSQL(ctx, data, column, data.shape[column]);
           }
         }
       }
     }
-    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
+    return simpleColumnToSQL(ctx, data, column, data.shape[column], quotedAs);
   }
 };
 const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
@@ -1933,17 +1940,30 @@ 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 applySqlComputed(ctx, data, col.data.computed, column, quoted);
     }
     return `"${tableName}"."${key}"`;
   }
   return `"${tableName}"."${key}"`;
 };
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select) => {
+const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
+  const index = column.indexOf(".");
+  return index !== -1 ? tableColumnToSqlWithAs(
+    ctx,
+    data,
+    column,
+    column.slice(0, index),
+    column.slice(index + 1),
+    as,
+    quotedAs,
+    select
+  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+};
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
   var _a, _b, _c;
   if (key === "*") {
     if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-      return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
+      return select ? `row_to_json("${table}".*) "${as}"` : `"${table}".r "${as}"`;
     }
     return column;
   }
@@ -1952,29 +1972,41 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select)
   const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
   if (col) {
     if (col.data.name && col.data.name !== key) {
-      return `"${tableName}"."${col.data.name}" "${key}"`;
+      return `"${tableName}"."${col.data.name}" "${as}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)} "${key}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quoted
+      )} "${as}"`;
     }
   }
-  return `"${tableName}"."${key}"`;
+  return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
+const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
   var _a;
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
-    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
+    return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
   }
   const col = data.shape[column];
   if (col) {
     if (col.data.name && col.data.name !== column) {
-      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}" "${column}"`;
+      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quotedAs)} "${column}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quotedAs
+      )} "${as}"`;
     }
   }
-  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
+  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
   return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
@@ -2011,26 +2043,33 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _query;
+var _query, _query2;
 class OrchidOrmError extends Error {
 }
 class NotFoundError extends OrchidOrmError {
   constructor(query, message = "Record is not found") {
     super(message);
-    this.query = query;
+    // `#query` is private to prevent it from serializing to not cause problems to test runner reports
+    __privateAdd(this, _query, void 0);
+    __privateSet(this, _query, query);
+  }
+  get query() {
+    return __privateGet(this, _query);
   }
 }
+_query = new WeakMap();
 class OrchidOrmInternalError extends Error {
   constructor(query, message) {
     super(message);
-    __privateAdd(this, _query, void 0);
-    __privateSet(this, _query, query);
+    // `#query` is private to prevent it from serializing to not cause problems to test runner reports
+    __privateAdd(this, _query2, void 0);
+    __privateSet(this, _query2, query);
   }
   get query() {
-    return __privateGet(this, _query);
+    return __privateGet(this, _query2);
   }
 }
-_query = new WeakMap();
+_query2 = new WeakMap();
 class QueryError extends OrchidOrmInternalError {
   get isUnique() {
     return this.code === "23505";
@@ -2306,7 +2345,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         let column = query.shape[key];
         let quotedColumn;
         if (column) {
-          quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
+          quotedColumn = simpleExistingColumnToSQL(
+            ctx,
+            query,
+            key,
+            column,
+            quotedAs
+          );
         } else if (!column) {
           const index = key.indexOf(".");
           if (index !== -1) {
@@ -2314,7 +2359,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             const quoted = `"${table2}"`;
             const name = key.slice(index + 1);
             column = quotedAs === quoted ? query.shape[name] : (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table2]) == null ? void 0 : _b[name];
-            quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
+            quotedColumn = simpleColumnToSQL(ctx, query, name, column, quoted);
           } else {
             column = (_d = (_c = query.joinedShapes) == null ? void 0 : _c[key]) == null ? void 0 : _d.value;
             quotedColumn = `"${key}".r`;
@@ -2380,25 +2425,25 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
 
-var __defProp$h = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
+var __defProp$i = Object.defineProperty;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$i = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+    if (__hasOwnProp$j.call(b, prop))
+      __defNormalProp$i(a, prop, b[prop]);
+  if (__getOwnPropSymbols$j)
+    for (var prop of __getOwnPropSymbols$j(b)) {
+      if (__propIsEnum$j.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
@@ -2460,8 +2505,8 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$7(__spreadValues$h({}, q.q), {
-          joinedShapes: __spreadProps$7(__spreadValues$h(__spreadValues$h({}, query.joinedShapes), q.q.joinedShapes), {
+        __spreadProps$9(__spreadValues$i({}, q.q), {
+          joinedShapes: __spreadProps$9(__spreadValues$i(__spreadValues$i({}, query.joinedShapes), q.q.joinedShapes), {
             [table.q.as || table.table]: table.q.shape
           })
         }),
@@ -2608,25 +2653,25 @@ const getIsJoinSubQuery = (query) => {
   return false;
 };
 
-var __defProp$g = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __defProp$h = Object.defineProperty;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$h = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$i.call(b, prop))
+      __defNormalProp$h(a, prop, b[prop]);
+  if (__getOwnPropSymbols$i)
+    for (var prop of __getOwnPropSymbols$i(b)) {
+      if (__propIsEnum$i.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   var _a;
   if (typeof first === "string") {
@@ -2663,13 +2708,13 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$6(__spreadValues$g({}, joinToQ.joinedShapes), {
+      const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinToQ.joinedShapes), {
         [joinToQ.as || joinTo.table]: joinTo.shape
       });
       const r = args[0](
         makeJoinQueryBuilder(
           j,
-          j.q.joinedShapes ? __spreadValues$g(__spreadValues$g({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
+          j.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
           joinTo
         )
       );
@@ -2696,16 +2741,16 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         pushQueryArray(q, "or", query.or);
       }
       if (query.scopes) {
-        q.q.scopes = __spreadValues$g(__spreadValues$g({}, q.q.scopes), query.scopes);
+        q.q.scopes = __spreadValues$h(__spreadValues$h({}, q.q.scopes), query.scopes);
       }
     }
-    const joinedShapes = __spreadProps$6(__spreadValues$g({}, joinTo.q.joinedShapes), {
+    const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
     const r = args0(
       makeJoinQueryBuilder(
         q,
-        q.q.joinedShapes ? __spreadValues$g(__spreadValues$g({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
+        q.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
         joinTo
       )
     );
@@ -2753,25 +2798,25 @@ const _queryNone = (q) => {
 };
 const isQueryNone = (q) => q.then === noneMethods.then;
 
-var __defProp$f = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __defProp$g = Object.defineProperty;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$g = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$h.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$h)
+    for (var prop of __getOwnPropSymbols$h(b)) {
+      if (__propIsEnum$h.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const _join = (query, require2, type, first, args) => {
   var _a, _b, _c, _d;
   let joinKey;
@@ -2816,7 +2861,7 @@ const _join = (query, require2, type, first, args) => {
       computeds = w == null ? void 0 : w.computeds;
       if (shape) {
         if (!require2)
-          shape = __spreadValues$f({}, shape);
+          shape = __spreadValues$g({}, shape);
         parsers = {};
         for (const key in shape) {
           const parser = shape[key].parseFn;
@@ -2916,7 +2961,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
         t.table = arg;
         t.shape = w.shape;
         t.computeds = w.computeds;
-        t.q = __spreadProps$5(__spreadValues$f({}, t.q), {
+        t.q = __spreadProps$7(__spreadValues$g({}, t.q), {
           shape: w.shape
         });
         t.baseQuery = t;
@@ -3235,12 +3280,46 @@ class QueryLog {
   }
 }
 
+var __defProp$f = Object.defineProperty;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 const commitSql$1 = {
   text: "COMMIT"
 };
 const rollbackSql$1 = {
   text: "ROLLBACK"
 };
+class AfterCommitError extends OrchidOrmError {
+  constructor(result, hookResults) {
+    super("After commit hooks have failed");
+    this.result = result;
+    this.hookResults = hookResults;
+  }
+}
+const _afterCommitError = (result, hookResults, catchAfterCommitError) => {
+  const err = new AfterCommitError(result, hookResults);
+  if (catchAfterCommitError) {
+    catchAfterCommitError(err);
+  } else {
+    throw err;
+  }
+};
 class Transaction {
   async transaction(cbOrOptions, cb) {
     var _a;
@@ -3286,7 +3365,10 @@ class Transaction {
         const result = await this.q.adapter.transaction(sql, callback);
         if (log)
           log.afterQuery(commitSql$1, logData);
-        await runAfterCommit(trx.afterCommit);
+        await runAfterCommit(
+          trx.afterCommit,
+          result
+        );
         return result;
       } catch (err) {
         if (log)
@@ -3320,7 +3402,8 @@ class Transaction {
           log.afterQuery(sql, logData);
         if (transactionId === trx.testTransactionCount) {
           await runAfterCommit(
-            trx.afterCommit
+            trx.afterCommit,
+            result
           );
         }
         return result;
@@ -3330,17 +3413,37 @@ class Transaction {
     }
   }
 }
-const runAfterCommit = async (afterCommit) => {
+const runAfterCommit = async (afterCommit, result) => {
   if (afterCommit) {
     const promises = [];
+    let catchAfterCommitError;
     for (let i = 0, len = afterCommit.length; i < len; i += 3) {
-      const result = afterCommit[i];
+      const result2 = afterCommit[i];
       const q = afterCommit[i + 1];
+      if (q.q.catchAfterCommitError) {
+        catchAfterCommitError = q.q.catchAfterCommitError;
+      }
       for (const fn of afterCommit[i + 2]) {
-        promises.push(fn(result, q));
+        try {
+          promises.push(fn(result2, q));
+        } catch (err) {
+          promises.push(Promise.reject(err));
+        }
       }
     }
-    await Promise.all(promises);
+    const hookResults = await Promise.allSettled(promises);
+    if (hookResults.some((result2) => result2.status === "rejected")) {
+      const resultsWithNames = [];
+      let r = 0;
+      for (let i = 0, len = afterCommit.length; i < len; i += 3) {
+        for (const fn of afterCommit[i + 2]) {
+          resultsWithNames.push(__spreadProps$6(__spreadValues$f({}, hookResults[r++]), {
+            name: fn.name
+          }));
+        }
+      }
+      _afterCommitError(result, resultsWithNames, catchAfterCommitError);
+    }
   }
 };
 
@@ -3397,8 +3500,8 @@ const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key
 };
 
 var __defProp$e = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
 var __hasOwnProp$f = Object.prototype.hasOwnProperty;
 var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
@@ -3414,7 +3517,7 @@ var __spreadValues$e = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 class ComputedColumn {
   constructor(kind, deps, fn) {
     this.kind = kind;
@@ -3431,7 +3534,7 @@ const applyComputedColumns = (q, fn) => {
   for (const key in computed) {
     const item = computed[key];
     if (item instanceof ComputedColumn) {
-      q.q.computeds = __spreadProps$4(__spreadValues$e({}, q.q.computeds), { [key]: item });
+      q.q.computeds = __spreadProps$5(__spreadValues$e({}, q.q.computeds), { [key]: item });
     } else {
       (q.shape[key] = item.result.value || UnknownColumn.instance).data.computed = item;
     }
@@ -3540,6 +3643,8 @@ const saveBatchComputed = (key, result, res, blanks) => {
 };
 
 var __defProp$d = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
 var __hasOwnProp$e = Object.prototype.hasOwnProperty;
 var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -3555,6 +3660,7 @@ var __spreadValues$d = (a, b) => {
     }
   return a;
 };
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const queryMethodByReturnType = {
   undefined: "query",
   all: "query",
@@ -3775,15 +3881,35 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
             )
           );
         }
-        if (afterCommitHooks && trx) {
-          ((_c = trx.afterCommit) != null ? _c : trx.afterCommit = []).push(
-            result,
-            q,
-            afterCommitHooks
-          );
-        } else if (afterCommitHooks) {
-          const args = [result, q];
-          await Promise.all(afterCommitHooks.map(callAfterHook, args));
+        if (afterCommitHooks) {
+          if (trx) {
+            ((_c = trx.afterCommit) != null ? _c : trx.afterCommit = []).push(
+              result,
+              q,
+              afterCommitHooks
+            );
+          } else {
+            const promises = [];
+            for (const fn of afterCommitHooks) {
+              try {
+                promises.push(
+                  fn(result, q)
+                );
+              } catch (err) {
+                promises.push(Promise.reject(err));
+              }
+            }
+            const hookResults = await Promise.allSettled(promises);
+            if (hookResults.some((result2) => result2.status === "rejected")) {
+              _afterCommitError(
+                result,
+                hookResults.map((result2, i) => __spreadProps$4(__spreadValues$d({}, result2), {
+                  name: afterCommitHooks[i].name
+                })),
+                q.q.catchAfterCommitError
+              );
+            }
+          }
         }
       } else if (query.after) {
         const args = [result, q];
@@ -4849,13 +4975,21 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               item,
               tableName,
               key,
+              key === "*" ? tableName : key,
               quotedAs,
               true
             );
           } else {
             if (hookSelect == null ? void 0 : hookSelect.get(item))
               (selected != null ? selected : selected = {})[item] = quotedAs;
-            sql = ownColumnToSqlWithAs(ctx, table.q, item, quotedAs, true);
+            sql = ownColumnToSqlWithAs(
+              ctx,
+              table.q,
+              item,
+              item,
+              quotedAs,
+              true
+            );
           }
         }
         list.push(sql);
@@ -4874,14 +5008,14 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               }
             } else if (value) {
               list.push(
-                `${columnToSql(
+                columnToSqlWithAs(
                   ctx,
                   table.q,
-                  table.q.shape,
                   value,
+                  as,
                   quotedAs,
                   true
-                )} "${as}"`
+                )
               );
             }
           }
@@ -4910,7 +5044,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         quotedTable = quotedAs;
         columnName = select;
         col = query.shape[select];
-        sql = simpleColumnToSQL(ctx, select, col, quotedAs);
+        sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
       if (selected == null ? void 0 : selected[columnName]) {
         if ((selected == null ? void 0 : selected[columnName]) === quotedTable) {
@@ -8391,6 +8525,32 @@ class QueryHooks {
       cb
     );
   }
+  /**
+   * Add `catchAfterCommitError` to the query to catch possible errors that are coming from after commit hooks.
+   *
+   * When it is used, the transaction will return its result disregarding of a failed hook.
+   *
+   * Without `catchAfterCommitError`, the transaction function throws and won't return result.
+   * Result is still accessible from the error object [AfterCommitError](#AfterCommitError).
+   *
+   * ```ts
+   * const result = await db
+   *   .$transaction(async () => {
+   *     return db.table.create(data);
+   *   })
+   *   .catchAfterCommitError((err) => {
+   *     // err is instance of AfterCommitError (see below)
+   *   });
+   *
+   * // result is available even if an after commit hook has failed
+   * result.id;
+   * ```
+   */
+  catchAfterCommitError(fn) {
+    const q = this.clone();
+    q.q.catchAfterCommitError = fn;
+    return q;
+  }
 }
 
 class Join {
@@ -11379,6 +11539,8 @@ class ColumnRefExpression extends orchidCore.Expression {
   makeSQL(ctx, quotedAs) {
     return simpleExistingColumnToSQL(
       ctx,
+      // it's for parsers for computed SQL. In the column ref case, parsers should be set when selecting the column ref.
+      {},
       this.name,
       this.result.value,
       quotedAs
@@ -12844,6 +13006,7 @@ function copyTableData(query, arg) {
 }
 
 exports.Adapter = Adapter;
+exports.AfterCommitError = AfterCommitError;
 exports.AggregateMethods = AggregateMethods;
 exports.ArrayColumn = ArrayColumn;
 exports.AsMethods = AsMethods;
@@ -12945,6 +13108,7 @@ exports.VirtualColumn = VirtualColumn;
 exports.Where = Where;
 exports.WithMethods = WithMethods;
 exports.XMLColumn = XMLColumn;
+exports._afterCommitError = _afterCommitError;
 exports._getSelectableColumn = _getSelectableColumn;
 exports._initQueryBuilder = _initQueryBuilder;
 exports._queryAfterSaveCommit = _queryAfterSaveCommit;