pqb 0.26.4 → 0.26.5

package/dist/index.js

@@ -1805,369 +1805,726 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
-const addParserForRawExpression = (q, key, raw) => {
-  const type = raw._type;
-  if (type.parseFn)
-    orchidCore.setParserToQuery(q.q, key, type.parseFn);
-};
-const subQueryResult = {
-  // sub query can't return a rowCount, use -1 as for impossible case
-  rowCount: -1,
-  rows: orchidCore.emptyArray,
-  fields: orchidCore.emptyArray
+const queryMethodByReturnType = {
+  all: "query",
+  rows: "arrays",
+  pluck: "arrays",
+  one: "query",
+  oneOrThrow: "query",
+  value: "arrays",
+  valueOrThrow: "arrays",
+  rowCount: "arrays",
+  void: "arrays"
 };
-const addParsersForSelectJoined = (q, arg, as = arg) => {
-  var _a;
-  const parsers = (_a = q.q.joinedParsers) == null ? void 0 : _a[arg];
-  if (parsers) {
-    orchidCore.setParserToQuery(q.q, as, (item) => {
-      subQueryResult.rows = [item];
-      return q.q.handleResult(q, "one", subQueryResult, true);
+class Then {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  catch(fn) {
+    return this.then(void 0, fn);
+  }
+}
+let queryError = void 0;
+let getThen;
+if (process.versions.bun) {
+  getThen = function() {
+    queryError = new Error();
+    if (!this.internal)
+      return maybeWrappedThen;
+    const trx = this.internal.transactionStorage.getStore();
+    if (!trx)
+      return maybeWrappedThen;
+    return (resolve, reject) => {
+      return this.internal.transactionStorage.run(trx, () => {
+        return maybeWrappedThen.call(this, resolve, reject);
+      });
+    };
+  };
+} else {
+  getThen = function() {
+    queryError = new Error();
+    return maybeWrappedThen;
+  };
+}
+Object.defineProperty(Then.prototype, "then", {
+  get: getThen,
+  set(value) {
+    Object.defineProperty(this, "then", {
+      value
     });
   }
+});
+const handleResult = (q, returnType, result, isSubQuery) => {
+  return parseResult(q, q.q.parsers, returnType, result, isSubQuery);
 };
-const addParserForSelectItem = (q, as, key, arg) => {
-  if (typeof arg === "object" || typeof arg === "function") {
-    if (orchidCore.isExpression(arg)) {
-      addParserForRawExpression(q, key, arg);
-    } else {
-      const { q: query } = arg;
-      if (query.parsers || query.transform) {
-        orchidCore.setParserToQuery(q.q, key, (item) => {
-          const t = query.returnType || "all";
-          subQueryResult.rows = t === "value" || t === "valueOrThrow" ? [[item]] : t === "one" || t === "oneOrThrow" ? [item] : item;
-          return orchidCore.applyTransforms(
-            query.transform,
-            query.handleResult(arg, t, subQueryResult, true)
-          );
-        });
-      }
+function maybeWrappedThen(resolve, reject) {
+  const { q } = this;
+  let beforeHooks;
+  let afterHooks;
+  let afterCommitHooks;
+  if (q.type) {
+    if (q.type === "insert") {
+      beforeHooks = q.beforeCreate;
+      afterHooks = q.afterCreate;
+      afterCommitHooks = q.afterCreateCommit;
+    } else if (q.type === "update") {
+      beforeHooks = q.beforeUpdate;
+      afterHooks = q.afterUpdate;
+      afterCommitHooks = q.afterUpdateCommit;
+    } else if (q.type === "delete") {
+      beforeHooks = q.beforeDelete;
+      afterHooks = q.afterDelete;
+      afterCommitHooks = q.afterDeleteCommit;
     }
-    return arg;
-  }
-  return setParserForSelectedString(q, arg, as, key);
-};
-const emptyArrSQL = new RawSQL("'[]'");
-const processSelectArg = (q, as, arg, columnAs) => {
-  var _a, _b, _c, _d;
-  if (typeof arg === "string") {
-    return setParserForSelectedString(q, arg, as, columnAs);
   }
-  const selectAs = {};
-  for (const key in arg) {
-    let value = arg[key];
-    if (typeof value === "function") {
-      value = resolveSubQueryCallback(q, value);
-      if (!orchidCore.isExpression(value) && value.joinQuery) {
-        value = value.joinQuery(value, q);
-        let query;
-        const returnType = value.q.returnType;
-        if (!returnType || returnType === "all") {
-          query = value.json(false);
-          value.q.coalesceValue = emptyArrSQL;
-        } else if (returnType === "pluck") {
-          query = value.wrap(value.baseQuery.clone()).jsonAgg(value.q.select[0]);
-          value.q.coalesceValue = emptyArrSQL;
-        } else {
-          if ((returnType === "value" || returnType === "valueOrThrow") && value.q.select) {
-            if (typeof value.q.select[0] === "string") {
-              value.q.select[0] = {
-                selectAs: { r: value.q.select[0] }
-              };
-            }
-          }
-          query = value;
-        }
-        let asOverride = key;
-        if ((_a = value.q.joinedShapes) == null ? void 0 : _a[key]) {
-          let suffix = 2;
-          const joinOverrides = (_c = (_b = q.q).joinOverrides) != null ? _c : _b.joinOverrides = {};
-          while (joinOverrides[asOverride = `${key}${suffix}`]) {
-            suffix++;
-          }
-          joinOverrides[asOverride] = asOverride;
-          joinOverrides[key] = asOverride;
-        }
-        value.q.joinedForSelect = asOverride;
-        _joinLateral(
-          q,
-          value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
-          query,
-          (q2) => q2,
-          key
+  const trx = this.internal.transactionStorage.getStore();
+  if ((q.wrapInTransaction || afterHooks) && !trx) {
+    return this.transaction(
+      () => new Promise((resolve2, reject2) => {
+        const trx2 = this.internal.transactionStorage.getStore();
+        return then(
+          this,
+          trx2.adapter,
+          trx2,
+          beforeHooks,
+          afterHooks,
+          afterCommitHooks,
+          resolve2,
+          reject2
         );
-      } else if (((_d = value.q) == null ? void 0 : _d.isSubQuery) && value.q.expr) {
-        value = value.q.expr;
-      }
-    }
-    selectAs[key] = addParserForSelectItem(
-      q,
-      as,
-      key,
-      value
+      })
+    ).then(resolve, reject);
+  } else {
+    return then(
+      this,
+      (trx == null ? void 0 : trx.adapter) || this.q.adapter,
+      trx,
+      beforeHooks,
+      afterHooks,
+      afterCommitHooks,
+      resolve,
+      reject
     );
   }
-  return { selectAs };
+}
+const queriesNames = {};
+let nameI = 0;
+const callAfterHook = function(cb) {
+  return cb(this[0], this[1]);
 };
-const setParserForSelectedString = (q, arg, as, columnAs) => {
-  var _a, _b, _c, _d;
-  const index = arg.indexOf(".");
-  if (index !== -1) {
-    const table = arg.slice(0, index);
-    const column = arg.slice(index + 1);
-    if (column === "*") {
-      addParsersForSelectJoined(q, table, columnAs);
-      return table === as ? column : arg;
-    } else {
-      if (table === as) {
-        const parser = (_a = q.q.parsers) == null ? void 0 : _a[column];
-        if (parser)
-          orchidCore.setParserToQuery(q.q, columnAs || column, parser);
-        return column;
-      } else {
-        const parser = (_c = (_b = q.q.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
-        if (parser)
-          orchidCore.setParserToQuery(q.q, columnAs || column, parser);
-        return arg;
-      }
+const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
+  var _a;
+  const { q: query } = q;
+  let sql;
+  let logData;
+  const localError = queryError;
+  try {
+    if (beforeHooks || query.before) {
+      await Promise.all(
+        [...beforeHooks || orchidCore.emptyArray, ...query.before || orchidCore.emptyArray].map(
+          orchidCore.callWithThis,
+          q
+        )
+      );
     }
-  } else {
-    const parser = (_d = q.q.parsers) == null ? void 0 : _d[arg];
-    if (parser)
-      orchidCore.setParserToQuery(q.q, columnAs || arg, parser);
-    return arg;
-  }
-};
-const getShapeFromSelect = (q, isSubQuery) => {
-  const query = q.q;
-  const { select, shape } = query;
-  let result;
-  if (!select) {
-    if (isSubQuery) {
-      result = {};
-      for (const key in shape) {
-        const column = shape[key];
-        result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
-      }
-    } else {
-      result = shape;
+    sql = q.toSQL();
+    const { hookSelect } = sql;
+    if (query.autoPreparedStatements) {
+      sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
     }
-  } else {
-    result = {};
-    for (const item of select) {
-      if (typeof item === "string") {
-        addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
-      } else if ("selectAs" in item) {
-        for (const key in item.selectAs) {
-          const it = item.selectAs[key];
-          if (typeof it === "string") {
-            addColumnToShapeFromSelect(
-              q,
-              it,
-              shape,
-              query,
-              result,
-              isSubQuery,
-              key
-            );
-          } else if (orchidCore.isExpression(it)) {
-            result[key] = it._type;
-          } else {
-            const { returnType } = it.q;
-            if (returnType === "value" || returnType === "valueOrThrow") {
-              const type = it.q[orchidCore.getValueKey];
-              if (type)
-                result[key] = type;
-            } else {
-              result[key] = new JSONTextColumn(defaultSchemaConfig);
-            }
-          }
+    if (query.log) {
+      logData = query.log.beforeQuery(sql);
+    }
+    const { returnType = "all" } = query;
+    const returns = hookSelect ? "all" : returnType;
+    const queryResult = await adapter[hookSelect ? "query" : queryMethodByReturnType[returnType]](sql);
+    if (query.patchResult) {
+      await query.patchResult(q, queryResult);
+    }
+    if (query.log) {
+      query.log.afterQuery(sql, logData);
+      sql = void 0;
+    }
+    let result = query.handleResult(q, returns, queryResult);
+    if (afterHooks || afterCommitHooks || query.after) {
+      if (queryResult.rowCount) {
+        if (afterHooks || query.after) {
+          const args = [result, q];
+          await Promise.all(
+            [...afterHooks || orchidCore.emptyArray, ...query.after || orchidCore.emptyArray].map(
+              callAfterHook,
+              args
+            )
+          );
+        }
+        if (afterCommitHooks && trx) {
+          ((_a = trx.afterCommit) != null ? _a : trx.afterCommit = []).push(
+            result,
+            q,
+            afterCommitHooks
+          );
+        } else if (afterCommitHooks) {
+          const args = [result, q];
+          await Promise.all(afterCommitHooks.map(callAfterHook, args));
         }
+      } else if (query.after) {
+        const args = [result, q];
+        await Promise.all(query.after.map(callAfterHook, args));
+      }
+      if (hookSelect)
+        result = filterResult(q, returnType, queryResult, hookSelect, result);
+    }
+    if (query.transform) {
+      for (const fn of query.transform) {
+        result = fn(result);
+      }
+    }
+    return resolve == null ? void 0 : resolve(result);
+  } catch (err) {
+    let error;
+    if (err instanceof pg.DatabaseError) {
+      error = new q.error();
+      assignError(error, err);
+      error.cause = localError;
+    } else {
+      error = err;
+      if (error instanceof Error) {
+        error.cause = localError;
       }
     }
+    if (query.log && sql) {
+      query.log.onError(error, sql, logData);
+    }
+    return reject == null ? void 0 : reject(error);
   }
-  return result;
 };
-const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, key) => {
+const assignError = (to, from) => {
+  to.message = from.message;
+  to.length = from.length;
+  to.name = from.name;
+  to.severity = from.severity;
+  to.code = from.code;
+  to.detail = from.detail;
+  to.hint = from.hint;
+  to.position = from.position;
+  to.internalPosition = from.internalPosition;
+  to.internalQuery = from.internalQuery;
+  to.where = from.where;
+  to.schema = from.schema;
+  to.table = from.table;
+  to.column = from.column;
+  to.dataType = from.dataType;
+  to.constraint = from.constraint;
+  to.file = from.file;
+  to.line = from.line;
+  to.routine = from.routine;
+  return to;
+};
+const parseResult = (q, parsers, returnType = "all", result, isSubQuery) => {
   var _a, _b;
-  if (q.relations[arg]) {
-    result[key || arg] = orchidCore.emptyObject;
-    return;
+  switch (returnType) {
+    case "all": {
+      if (q.q.throwOnNotFound && result.rows.length === 0)
+        throw new NotFoundError(q);
+      const { rows } = result;
+      if (parsers) {
+        for (const row of rows) {
+          parseRecord(parsers, row);
+        }
+      }
+      return rows;
+    }
+    case "one": {
+      const row = result.rows[0];
+      if (!row)
+        return;
+      return parsers ? parseRecord(parsers, row) : row;
+    }
+    case "oneOrThrow": {
+      const row = result.rows[0];
+      if (!row)
+        throw new NotFoundError(q);
+      return parsers ? parseRecord(parsers, row) : row;
+    }
+    case "rows": {
+      return parsers ? parseRows(
+        parsers,
+        result.fields,
+        result.rows
+      ) : result.rows;
+    }
+    case "pluck": {
+      const pluck = parsers == null ? void 0 : parsers.pluck;
+      if (pluck) {
+        return result.rows.map(isSubQuery ? pluck : (row) => pluck(row[0]));
+      } else if (isSubQuery) {
+        return result.rows;
+      }
+      return result.rows.map((row) => row[0]);
+    }
+    case "value": {
+      const value = (_a = result.rows[0]) == null ? void 0 : _a[0];
+      return value !== void 0 ? parseValue(value, parsers) : q.q.notFoundDefault;
+    }
+    case "valueOrThrow": {
+      const value = (_b = result.rows[0]) == null ? void 0 : _b[0];
+      if (value === void 0)
+        throw new NotFoundError(q);
+      return parseValue(value, parsers);
+    }
+    case "rowCount": {
+      if (q.q.throwOnNotFound && result.rowCount === 0) {
+        throw new NotFoundError(q);
+      }
+      return result.rowCount;
+    }
+    case "void": {
+      return;
+    }
   }
-  const index = arg.indexOf(".");
-  if (index !== -1) {
-    const table = arg.slice(0, index);
-    const column = arg.slice(index + 1);
-    if (table === (q.q.as || q.table)) {
-      result[key || column] = shape[column];
-    } else {
-      const it = (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
-      if (it)
-        result[key || column] = maybeUnNameColumn(it, isSubQuery);
+};
+const parseRecord = (parsers, row) => {
+  for (const key in parsers) {
+    if (key in row) {
+      row[key] = parsers[key](row[key]);
     }
-  } else if (arg === "*") {
-    for (const key2 in shape) {
-      result[key2] = maybeUnNameColumn(shape[key2], isSubQuery);
+  }
+  return row;
+};
+const parseRows = (parsers, fields, rows) => {
+  for (let i = fields.length - 1; i >= 0; i--) {
+    const parser = parsers[fields[i].name];
+    if (parser) {
+      for (const row of rows) {
+        row[i] = parser(row[i]);
+      }
     }
-  } else {
-    result[key || arg] = maybeUnNameColumn(shape[arg], isSubQuery);
   }
+  return rows;
 };
-const maybeUnNameColumn = (column, isSubQuery) => {
-  return isSubQuery && (column == null ? void 0 : column.data.name) ? orchidCore.setColumnData(column, "name", void 0) : column;
+const parseValue = (value, parsers) => {
+  const parser = parsers == null ? void 0 : parsers[orchidCore.getValueKey];
+  return parser ? parser(value) : value;
 };
-function _querySelect(q, args) {
-  if (!args.length) {
-    return q;
+const filterResult = (q, returnType, queryResult, hookSelect, result) => {
+  var _a;
+  if (returnType === "all") {
+    const pick = getSelectPick(queryResult, hookSelect);
+    return result.map((full) => {
+      const filtered = {};
+      for (const key of pick) {
+        filtered[key] = full[key];
+      }
+      return filtered;
+    });
   }
-  const as = q.q.as || q.table;
-  const selectArgs = args.map((item) => processSelectArg(q, as, item));
-  return pushQueryArray(q, "select", selectArgs);
-}
-class Select {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  select(...args) {
-    return _querySelect(this.clone(), args);
+  if (returnType === "oneOrThrow" || returnType === "one") {
+    const row = result[0];
+    if (!row) {
+      if (returnType === "oneOrThrow")
+        throw new NotFoundError(q);
+      return void 0;
+    } else {
+      result = {};
+      for (const key in row) {
+        if (!hookSelect.includes(key)) {
+          result[key] = row[key];
+        }
+      }
+      return result;
+    }
   }
-  /**
-   * When querying the table or creating records, all columns are selected by default,
-   * but updating and deleting queries are returning affected row counts by default.
-   *
-   * Use `selectAll` to select all columns. If the `.select` method was applied before it will be discarded.
-   *
-   * ```ts
-   * const selectFull = await db.table
-   *   .select('id', 'name') // discarded by `selectAll`
-   *   .selectAll();
-   *
-   * const updatedFull = await db.table.selectAll().where(conditions).update(data);
-   *
-   * const deletedFull = await db.table.selectAll().where(conditions).delete();
-   * ```
-   */
-  selectAll() {
-    const q = this.clone();
-    q.q.select = ["*"];
-    return q;
+  if (returnType === "value") {
+    return (_a = result[0]) == null ? void 0 : _a[queryResult.fields[0].name];
   }
-}
-
-class SelectItemExpression extends orchidCore.Expression {
-  constructor(q, item, _type) {
-    super();
-    this.q = q;
-    this.item = item;
-    this._type = _type;
+  if (returnType === "valueOrThrow") {
+    const row = result[0];
+    if (!row)
+      throw new NotFoundError(q);
+    return row[queryResult.fields[0].name];
   }
-  // `makeSQL` acts similarly to how select args are handled,
-  // except that it will use non-aliasing `columnToSql` when `ctx.aliasValue` is true,
-  // it is needed for relation sub-queries that returns a single column.
-  makeSQL(ctx, quotedAs) {
-    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.q, this.q.q, quotedAs) : ctx.aliasValue ? columnToSql(ctx, this.q.q, this.q.q.shape, this.item, quotedAs, true) : columnToSqlWithAs(ctx, this.q.q, this.item, quotedAs, true) : selectedObjectToSQL(ctx, this.q, quotedAs, this.item);
+  if (returnType === "rowCount") {
+    return queryResult.rowCount;
   }
-}
+  if (returnType === "pluck") {
+    const key = queryResult.fields[0].name;
+    return result.map((row) => row[key]);
+  }
+  if (returnType === "rows") {
+    const pick = getSelectPick(queryResult, hookSelect);
+    return result.map(
+      (full) => pick.map((key) => full[key])
+    );
+  }
+  return;
+};
+const getSelectPick = (queryResult, hookSelect) => {
+  const pick = [];
+  for (const field of queryResult.fields) {
+    if (!hookSelect.includes(field.name))
+      pick.push(field.name);
+  }
+  return pick;
+};
 
-const _get = (query, returnType, arg) => {
-  var _a, _b;
-  const q = query.q;
-  q.returnType = returnType;
-  let type;
+const addParserForRawExpression = (q, key, raw) => {
+  const type = raw._type;
+  if (type.parseFn)
+    orchidCore.setParserToQuery(q.q, key, type.parseFn);
+};
+const subQueryResult = {
+  // sub query can't return a rowCount, use -1 as for impossible case
+  rowCount: -1,
+  rows: orchidCore.emptyArray,
+  fields: orchidCore.emptyArray
+};
+const addParsersForSelectJoined = (q, arg, as = arg) => {
+  var _a;
+  const parsers = (_a = q.q.joinedParsers) == null ? void 0 : _a[arg];
+  if (parsers) {
+    orchidCore.setParserToQuery(q.q, as, (row) => parseRecord(parsers, row));
+  }
+};
+const addParserForSelectItem = (q, as, key, arg) => {
+  if (typeof arg === "object" || typeof arg === "function") {
+    if (orchidCore.isExpression(arg)) {
+      addParserForRawExpression(q, key, arg);
+    } else {
+      const { q: query } = arg;
+      if (query.parsers || query.transform) {
+        orchidCore.setParserToQuery(q.q, key, (item) => {
+          const t = query.returnType || "all";
+          subQueryResult.rows = t === "value" || t === "valueOrThrow" ? [[item]] : t === "one" || t === "oneOrThrow" ? [item] : item;
+          return orchidCore.applyTransforms(
+            query.transform,
+            query.handleResult(arg, t, subQueryResult, true)
+          );
+        });
+      }
+    }
+    return arg;
+  }
+  return setParserForSelectedString(q, arg, as, key);
+};
+const emptyArrSQL = new RawSQL("'[]'");
+const processSelectArg = (q, as, arg, columnAs) => {
+  var _a, _b, _c, _d;
   if (typeof arg === "string") {
-    type = q.shape[arg];
-    if (!type) {
-      const index = arg.indexOf(".");
-      if (index !== -1) {
-        const table = arg.slice(0, index);
-        const column = arg.slice(index + 1);
-        if (table === (q.as || query.table)) {
-          type = q.shape[column];
+    return setParserForSelectedString(q, arg, as, columnAs);
+  }
+  const selectAs = {};
+  for (const key in arg) {
+    let value = arg[key];
+    if (typeof value === "function") {
+      value = resolveSubQueryCallback(q, value);
+      if (!orchidCore.isExpression(value) && value.joinQuery) {
+        value = value.joinQuery(value, q);
+        let query;
+        const returnType = value.q.returnType;
+        if (!returnType || returnType === "all") {
+          query = value.json(false);
+          value.q.coalesceValue = emptyArrSQL;
+        } else if (returnType === "pluck") {
+          query = value.wrap(value.baseQuery.clone()).jsonAgg(value.q.select[0]);
+          value.q.coalesceValue = emptyArrSQL;
         } else {
-          type = (_b = (_a = q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+          if ((returnType === "value" || returnType === "valueOrThrow") && value.q.select) {
+            if (typeof value.q.select[0] === "string") {
+              value.q.select[0] = {
+                selectAs: { r: value.q.select[0] }
+              };
+            }
+          }
+          query = value;
+        }
+        let asOverride = key;
+        if ((_a = value.q.joinedShapes) == null ? void 0 : _a[key]) {
+          let suffix = 2;
+          const joinOverrides = (_c = (_b = q.q).joinOverrides) != null ? _c : _b.joinOverrides = {};
+          while (joinOverrides[asOverride = `${key}${suffix}`]) {
+            suffix++;
+          }
+          joinOverrides[asOverride] = asOverride;
+          joinOverrides[key] = asOverride;
         }
+        value.q.joinedForSelect = asOverride;
+        _joinLateral(
+          q,
+          value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
+          query,
+          (q2) => q2,
+          key
+        );
+      } else if (((_d = value.q) == null ? void 0 : _d.isSubQuery) && value.q.expr) {
+        value = value.q.expr;
       }
     }
-    q[orchidCore.getValueKey] = type;
-    setParserForSelectedString(
-      query,
-      arg,
-      getQueryAs(query),
-      orchidCore.getValueKey
-    );
-    q.expr = new SelectItemExpression(
-      query,
-      arg,
-      type || orchidCore.emptyObject
+    selectAs[key] = addParserForSelectItem(
+      q,
+      as,
+      key,
+      value
     );
-  } else {
-    type = arg._type;
-    q[orchidCore.getValueKey] = type;
-    addParserForRawExpression(query, orchidCore.getValueKey, arg);
-    q.expr = arg;
   }
-  q.select = [q.expr];
-  return setQueryOperators(
-    query,
-    (type == null ? void 0 : type.operators) || Operators.any
-  );
-};
-function _queryGet(self, arg) {
-  return _get(self, "valueOrThrow", arg);
-}
-function _queryGetOptional(self, arg) {
-  return _get(self, "value", arg);
-}
-
-const _queryAs = (self, as) => {
-  self.q.as = as;
-  return self;
+  return { selectAs };
 };
-class AsMethods {
-  /**
-   * Sets table alias:
-   *
-   * ```ts
-   * db.table.as('u').select('u.name');
-   *
-   * // Can be used in the join:
-   * db.table.join(Profile.as('p'), 'p.userId', 'user.id');
-   * ```
-   *
-   * @param as - alias for the table of this query
-   */
-  as(as) {
-    return _queryAs(this.clone(), as);
-  }
-}
-
-function queryFrom(self, arg, options) {
-  const data = self.q;
-  if (typeof arg === "string") {
-    data.as || (data.as = arg);
-  } else if (!orchidCore.isExpression(arg)) {
-    const q = arg;
-    data.as || (data.as = q.q.as || q.table || "t");
-    data.shape = getShapeFromSelect(arg, true);
-    data.parsers = q.q.parsers;
+const setParserForSelectedString = (q, arg, as, columnAs) => {
+  var _a, _b, _c, _d;
+  const index = arg.indexOf(".");
+  if (index !== -1) {
+    const table = arg.slice(0, index);
+    const column = arg.slice(index + 1);
+    if (column === "*") {
+      addParsersForSelectJoined(q, table, columnAs);
+      return table === as ? column : arg;
+    } else {
+      if (table === as) {
+        const parser = (_a = q.q.parsers) == null ? void 0 : _a[column];
+        if (parser)
+          orchidCore.setParserToQuery(q.q, columnAs || column, parser);
+        return column;
+      } else {
+        const parser = (_c = (_b = q.q.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
+        if (parser)
+          orchidCore.setParserToQuery(q.q, columnAs || column, parser);
+        return arg;
+      }
+    }
   } else {
-    data.as || (data.as = "t");
-  }
-  if (options == null ? void 0 : options.only) {
-    data.fromOnly = options.only;
+    const parser = (_d = q.q.parsers) == null ? void 0 : _d[arg];
+    if (parser)
+      orchidCore.setParserToQuery(q.q, columnAs || arg, parser);
+    return arg;
   }
-  data.from = arg;
-  return self;
-}
-function queryFromSql(self, args) {
-  const data = self.q;
-  data.as || (data.as = "t");
-  data.from = sqlQueryArgsToExpression(args);
-  return self;
-}
-class From {
-  /**
-   * Set the `FROM` value, by default the table name is used.
-   *
-   * ```ts
+};
+const getShapeFromSelect = (q, isSubQuery) => {
+  const query = q.q;
+  const { select, shape } = query;
+  let result;
+  if (!select) {
+    if (isSubQuery) {
+      result = {};
+      for (const key in shape) {
+        const column = shape[key];
+        result[key] = column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+      }
+    } else {
+      result = shape;
+    }
+  } else {
+    result = {};
+    for (const item of select) {
+      if (typeof item === "string") {
+        addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
+      } else if ("selectAs" in item) {
+        for (const key in item.selectAs) {
+          const it = item.selectAs[key];
+          if (typeof it === "string") {
+            addColumnToShapeFromSelect(
+              q,
+              it,
+              shape,
+              query,
+              result,
+              isSubQuery,
+              key
+            );
+          } else if (orchidCore.isExpression(it)) {
+            result[key] = it._type;
+          } else {
+            const { returnType } = it.q;
+            if (returnType === "value" || returnType === "valueOrThrow") {
+              const type = it.q[orchidCore.getValueKey];
+              if (type)
+                result[key] = type;
+            } else {
+              result[key] = new JSONTextColumn(defaultSchemaConfig);
+            }
+          }
+        }
+      }
+    }
+  }
+  return result;
+};
+const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, key) => {
+  var _a, _b;
+  if (q.relations[arg]) {
+    result[key || arg] = orchidCore.emptyObject;
+    return;
+  }
+  const index = arg.indexOf(".");
+  if (index !== -1) {
+    const table = arg.slice(0, index);
+    const column = arg.slice(index + 1);
+    if (table === (q.q.as || q.table)) {
+      result[key || column] = shape[column];
+    } else {
+      const it = (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+      if (it)
+        result[key || column] = maybeUnNameColumn(it, isSubQuery);
+    }
+  } else if (arg === "*") {
+    for (const key2 in shape) {
+      result[key2] = maybeUnNameColumn(shape[key2], isSubQuery);
+    }
+  } else {
+    result[key || arg] = maybeUnNameColumn(shape[arg], isSubQuery);
+  }
+};
+const maybeUnNameColumn = (column, isSubQuery) => {
+  return isSubQuery && (column == null ? void 0 : column.data.name) ? orchidCore.setColumnData(column, "name", void 0) : column;
+};
+function _querySelect(q, args) {
+  if (!args.length) {
+    return q;
+  }
+  const as = q.q.as || q.table;
+  const selectArgs = args.map((item) => processSelectArg(q, as, item));
+  return pushQueryArray(q, "select", selectArgs);
+}
+class Select {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  select(...args) {
+    return _querySelect(this.clone(), args);
+  }
+  /**
+   * When querying the table or creating records, all columns are selected by default,
+   * but updating and deleting queries are returning affected row counts by default.
+   *
+   * Use `selectAll` to select all columns. If the `.select` method was applied before it will be discarded.
+   *
+   * ```ts
+   * const selectFull = await db.table
+   *   .select('id', 'name') // discarded by `selectAll`
+   *   .selectAll();
+   *
+   * const updatedFull = await db.table.selectAll().where(conditions).update(data);
+   *
+   * const deletedFull = await db.table.selectAll().where(conditions).delete();
+   * ```
+   */
+  selectAll() {
+    const q = this.clone();
+    q.q.select = ["*"];
+    return q;
+  }
+}
+
+class SelectItemExpression extends orchidCore.Expression {
+  constructor(q, item, _type) {
+    super();
+    this.q = q;
+    this.item = item;
+    this._type = _type;
+  }
+  // `makeSQL` acts similarly to how select args are handled,
+  // except that it will use non-aliasing `columnToSql` when `ctx.aliasValue` is true,
+  // it is needed for relation sub-queries that returns a single column.
+  makeSQL(ctx, quotedAs) {
+    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.q, this.q.q, quotedAs) : ctx.aliasValue ? columnToSql(ctx, this.q.q, this.q.q.shape, this.item, quotedAs, true) : columnToSqlWithAs(ctx, this.q.q, this.item, quotedAs, true) : selectedObjectToSQL(ctx, this.q, quotedAs, this.item);
+  }
+}
+
+const _get = (query, returnType, arg) => {
+  var _a, _b;
+  const q = query.q;
+  q.returnType = returnType;
+  let type;
+  if (typeof arg === "string") {
+    type = q.shape[arg];
+    if (!type) {
+      const index = arg.indexOf(".");
+      if (index !== -1) {
+        const table = arg.slice(0, index);
+        const column = arg.slice(index + 1);
+        if (table === (q.as || query.table)) {
+          type = q.shape[column];
+        } else {
+          type = (_b = (_a = q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+        }
+      }
+    }
+    q[orchidCore.getValueKey] = type;
+    setParserForSelectedString(
+      query,
+      arg,
+      getQueryAs(query),
+      orchidCore.getValueKey
+    );
+    q.expr = new SelectItemExpression(
+      query,
+      arg,
+      type || orchidCore.emptyObject
+    );
+  } else {
+    type = arg._type;
+    q[orchidCore.getValueKey] = type;
+    addParserForRawExpression(query, orchidCore.getValueKey, arg);
+    q.expr = arg;
+  }
+  q.select = [q.expr];
+  return setQueryOperators(
+    query,
+    (type == null ? void 0 : type.operators) || Operators.any
+  );
+};
+function _queryGet(self, arg) {
+  return _get(self, "valueOrThrow", arg);
+}
+function _queryGetOptional(self, arg) {
+  return _get(self, "value", arg);
+}
+
+const _queryAs = (self, as) => {
+  self.q.as = as;
+  return self;
+};
+class AsMethods {
+  /**
+   * Sets table alias:
+   *
+   * ```ts
+   * db.table.as('u').select('u.name');
+   *
+   * // Can be used in the join:
+   * db.table.join(Profile.as('p'), 'p.userId', 'user.id');
+   * ```
+   *
+   * @param as - alias for the table of this query
+   */
+  as(as) {
+    return _queryAs(this.clone(), as);
+  }
+}
+
+function queryFrom(self, arg, options) {
+  const data = self.q;
+  if (typeof arg === "string") {
+    data.as || (data.as = arg);
+  } else if (!orchidCore.isExpression(arg)) {
+    const q = arg;
+    data.as || (data.as = q.q.as || q.table || "t");
+    data.shape = getShapeFromSelect(arg, true);
+    data.parsers = q.q.parsers;
+  } else {
+    data.as || (data.as = "t");
+  }
+  if (options == null ? void 0 : options.only) {
+    data.fromOnly = options.only;
+  }
+  data.from = arg;
+  return self;
+}
+function queryFromSql(self, args) {
+  const data = self.q;
+  data.as || (data.as = "t");
+  data.from = sqlQueryArgsToExpression(args);
+  return self;
+}
+class From {
+  /**
+   * Set the `FROM` value, by default the table name is used.
+   *
+   * ```ts
    * // accepts sub-query:
    * db.table.from(Otherdb.table.select('foo', 'bar'));
    *
@@ -8264,366 +8621,6 @@ class MergeQueryMethods {
   }
 }
 
-const queryMethodByReturnType = {
-  all: "query",
-  rows: "arrays",
-  pluck: "arrays",
-  one: "query",
-  oneOrThrow: "query",
-  value: "arrays",
-  valueOrThrow: "arrays",
-  rowCount: "arrays",
-  void: "arrays"
-};
-class Then {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  catch(fn) {
-    return this.then(void 0, fn);
-  }
-}
-let queryError = void 0;
-let getThen;
-if (process.versions.bun) {
-  getThen = function() {
-    queryError = new Error();
-    if (!this.internal)
-      return maybeWrappedThen;
-    const trx = this.internal.transactionStorage.getStore();
-    if (!trx)
-      return maybeWrappedThen;
-    return (resolve, reject) => {
-      return this.internal.transactionStorage.run(trx, () => {
-        return maybeWrappedThen.call(this, resolve, reject);
-      });
-    };
-  };
-} else {
-  getThen = function() {
-    queryError = new Error();
-    return maybeWrappedThen;
-  };
-}
-Object.defineProperty(Then.prototype, "then", {
-  get: getThen,
-  set(value) {
-    Object.defineProperty(this, "then", {
-      value
-    });
-  }
-});
-const handleResult = (q, returnType, result, isSubQuery) => {
-  return parseResult(q, q.q.parsers, returnType, result, isSubQuery);
-};
-function maybeWrappedThen(resolve, reject) {
-  const { q } = this;
-  let beforeHooks;
-  let afterHooks;
-  let afterCommitHooks;
-  if (q.type) {
-    if (q.type === "insert") {
-      beforeHooks = q.beforeCreate;
-      afterHooks = q.afterCreate;
-      afterCommitHooks = q.afterCreateCommit;
-    } else if (q.type === "update") {
-      beforeHooks = q.beforeUpdate;
-      afterHooks = q.afterUpdate;
-      afterCommitHooks = q.afterUpdateCommit;
-    } else if (q.type === "delete") {
-      beforeHooks = q.beforeDelete;
-      afterHooks = q.afterDelete;
-      afterCommitHooks = q.afterDeleteCommit;
-    }
-  }
-  const trx = this.internal.transactionStorage.getStore();
-  if ((q.wrapInTransaction || afterHooks) && !trx) {
-    return this.transaction(
-      () => new Promise((resolve2, reject2) => {
-        const trx2 = this.internal.transactionStorage.getStore();
-        return then(
-          this,
-          trx2.adapter,
-          trx2,
-          beforeHooks,
-          afterHooks,
-          afterCommitHooks,
-          resolve2,
-          reject2
-        );
-      })
-    ).then(resolve, reject);
-  } else {
-    return then(
-      this,
-      (trx == null ? void 0 : trx.adapter) || this.q.adapter,
-      trx,
-      beforeHooks,
-      afterHooks,
-      afterCommitHooks,
-      resolve,
-      reject
-    );
-  }
-}
-const queriesNames = {};
-let nameI = 0;
-const callAfterHook = function(cb) {
-  return cb(this[0], this[1]);
-};
-const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
-  var _a;
-  const { q: query } = q;
-  let sql;
-  let logData;
-  const localError = queryError;
-  try {
-    if (beforeHooks || query.before) {
-      await Promise.all(
-        [...beforeHooks || orchidCore.emptyArray, ...query.before || orchidCore.emptyArray].map(
-          orchidCore.callWithThis,
-          q
-        )
-      );
-    }
-    sql = q.toSQL();
-    const { hookSelect } = sql;
-    if (query.autoPreparedStatements) {
-      sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
-    }
-    if (query.log) {
-      logData = query.log.beforeQuery(sql);
-    }
-    const { returnType = "all" } = query;
-    const returns = hookSelect ? "all" : returnType;
-    const queryResult = await adapter[hookSelect ? "query" : queryMethodByReturnType[returnType]](sql);
-    if (query.patchResult) {
-      await query.patchResult(q, queryResult);
-    }
-    if (query.log) {
-      query.log.afterQuery(sql, logData);
-      sql = void 0;
-    }
-    let result = query.handleResult(q, returns, queryResult);
-    if (afterHooks || afterCommitHooks || query.after) {
-      if (queryResult.rowCount) {
-        if (afterHooks || query.after) {
-          const args = [result, q];
-          await Promise.all(
-            [...afterHooks || orchidCore.emptyArray, ...query.after || orchidCore.emptyArray].map(
-              callAfterHook,
-              args
-            )
-          );
-        }
-        if (afterCommitHooks && trx) {
-          ((_a = trx.afterCommit) != null ? _a : trx.afterCommit = []).push(
-            result,
-            q,
-            afterCommitHooks
-          );
-        } else if (afterCommitHooks) {
-          const args = [result, q];
-          await Promise.all(afterCommitHooks.map(callAfterHook, args));
-        }
-      } else if (query.after) {
-        const args = [result, q];
-        await Promise.all(query.after.map(callAfterHook, args));
-      }
-      if (hookSelect)
-        result = filterResult(q, returnType, queryResult, hookSelect, result);
-    }
-    if (query.transform) {
-      for (const fn of query.transform) {
-        result = fn(result);
-      }
-    }
-    return resolve == null ? void 0 : resolve(result);
-  } catch (err) {
-    let error;
-    if (err instanceof pg.DatabaseError) {
-      error = new q.error();
-      assignError(error, err);
-      error.cause = localError;
-    } else {
-      error = err;
-      if (error instanceof Error) {
-        error.cause = localError;
-      }
-    }
-    if (query.log && sql) {
-      query.log.onError(error, sql, logData);
-    }
-    return reject == null ? void 0 : reject(error);
-  }
-};
-const assignError = (to, from) => {
-  to.message = from.message;
-  to.length = from.length;
-  to.name = from.name;
-  to.severity = from.severity;
-  to.code = from.code;
-  to.detail = from.detail;
-  to.hint = from.hint;
-  to.position = from.position;
-  to.internalPosition = from.internalPosition;
-  to.internalQuery = from.internalQuery;
-  to.where = from.where;
-  to.schema = from.schema;
-  to.table = from.table;
-  to.column = from.column;
-  to.dataType = from.dataType;
-  to.constraint = from.constraint;
-  to.file = from.file;
-  to.line = from.line;
-  to.routine = from.routine;
-  return to;
-};
-const parseResult = (q, parsers, returnType = "all", result, isSubQuery) => {
-  var _a, _b;
-  switch (returnType) {
-    case "all": {
-      if (q.q.throwOnNotFound && result.rows.length === 0)
-        throw new NotFoundError(q);
-      const { rows } = result;
-      if (parsers) {
-        for (const row of rows) {
-          parseRecord(parsers, row);
-        }
-      }
-      return rows;
-    }
-    case "one": {
-      const row = result.rows[0];
-      if (!row)
-        return;
-      return parsers ? parseRecord(parsers, row) : row;
-    }
-    case "oneOrThrow": {
-      const row = result.rows[0];
-      if (!row)
-        throw new NotFoundError(q);
-      return parsers ? parseRecord(parsers, row) : row;
-    }
-    case "rows": {
-      return parsers ? parseRows(
-        parsers,
-        result.fields,
-        result.rows
-      ) : result.rows;
-    }
-    case "pluck": {
-      const pluck = parsers == null ? void 0 : parsers.pluck;
-      if (pluck) {
-        return result.rows.map(isSubQuery ? pluck : (row) => pluck(row[0]));
-      } else if (isSubQuery) {
-        return result.rows;
-      }
-      return result.rows.map((row) => row[0]);
-    }
-    case "value": {
-      const value = (_a = result.rows[0]) == null ? void 0 : _a[0];
-      return value !== void 0 ? parseValue(value, parsers) : q.q.notFoundDefault;
-    }
-    case "valueOrThrow": {
-      const value = (_b = result.rows[0]) == null ? void 0 : _b[0];
-      if (value === void 0)
-        throw new NotFoundError(q);
-      return parseValue(value, parsers);
-    }
-    case "rowCount": {
-      if (q.q.throwOnNotFound && result.rowCount === 0) {
-        throw new NotFoundError(q);
-      }
-      return result.rowCount;
-    }
-    case "void": {
-      return;
-    }
-  }
-};
-const parseRecord = (parsers, row) => {
-  for (const key in parsers) {
-    if (key in row) {
-      row[key] = parsers[key](row[key]);
-    }
-  }
-  return row;
-};
-const parseRows = (parsers, fields, rows) => {
-  for (let i = fields.length - 1; i >= 0; i--) {
-    const parser = parsers[fields[i].name];
-    if (parser) {
-      for (const row of rows) {
-        row[i] = parser(row[i]);
-      }
-    }
-  }
-  return rows;
-};
-const parseValue = (value, parsers) => {
-  const parser = parsers == null ? void 0 : parsers[orchidCore.getValueKey];
-  return parser ? parser(value) : value;
-};
-const filterResult = (q, returnType, queryResult, hookSelect, result) => {
-  var _a;
-  if (returnType === "all") {
-    const pick = getSelectPick(queryResult, hookSelect);
-    return result.map((full) => {
-      const filtered = {};
-      for (const key of pick) {
-        filtered[key] = full[key];
-      }
-      return filtered;
-    });
-  }
-  if (returnType === "oneOrThrow" || returnType === "one") {
-    const row = result[0];
-    if (!row) {
-      if (returnType === "oneOrThrow")
-        throw new NotFoundError(q);
-      return void 0;
-    } else {
-      result = {};
-      for (const key in row) {
-        if (!hookSelect.includes(key)) {
-          result[key] = row[key];
-        }
-      }
-      return result;
-    }
-  }
-  if (returnType === "value") {
-    return (_a = result[0]) == null ? void 0 : _a[queryResult.fields[0].name];
-  }
-  if (returnType === "valueOrThrow") {
-    const row = result[0];
-    if (!row)
-      throw new NotFoundError(q);
-    return row[queryResult.fields[0].name];
-  }
-  if (returnType === "rowCount") {
-    return queryResult.rowCount;
-  }
-  if (returnType === "pluck") {
-    const key = queryResult.fields[0].name;
-    return result.map((row) => row[key]);
-  }
-  if (returnType === "rows") {
-    const pick = getSelectPick(queryResult, hookSelect);
-    return result.map(
-      (full) => pick.map((key) => full[key])
-    );
-  }
-  return;
-};
-const getSelectPick = (queryResult, hookSelect) => {
-  const pick = [];
-  for (const field of queryResult.fields) {
-    if (!hookSelect.includes(field.name))
-      pick.push(field.name);
-  }
-  return pick;
-};
-
 var __defProp$4 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
 var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;