pqb 0.54.2 → 0.55.0

package/dist/index.js

@@ -2605,7 +2605,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
     const shape2 = data.joinedShapes?.[table];
     return shape2 ? select ? makeRowToJson(table, shape2, true) : `"${table}".*` : column;
   }
-  const tableName = data.aliases?.[table] || table;
+  const tableName = orchidCore._getQueryAliasOrName(data, table);
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
   if (col) {
@@ -2644,7 +2644,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
     }
     return column;
   }
-  const tableName = data.aliases?.[table] || table;
+  const tableName = orchidCore._getQueryAliasOrName(data, table);
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
   if (jsonList) jsonList[as] = col;
@@ -2705,72 +2705,6 @@ const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
   }
 };
 
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _query, _query2;
-class OrchidOrmError extends Error {
-}
-class NotFoundError extends OrchidOrmError {
-  constructor(query, message = "Record is not found") {
-    super(message);
-    // `#query` is private to prevent it from serializing to not cause problems to test runner reports
-    __privateAdd(this, _query);
-    __privateSet(this, _query, query);
-  }
-  get query() {
-    return __privateGet(this, _query);
-  }
-}
-_query = new WeakMap();
-class OrchidOrmInternalError extends Error {
-  constructor(query, message, data) {
-    super(message);
-    this.data = data;
-    // `#query` is private to prevent it from serializing to not cause problems to test runner reports
-    __privateAdd(this, _query2);
-    __privateSet(this, _query2, query);
-  }
-  get query() {
-    return __privateGet(this, _query2);
-  }
-}
-_query2 = new WeakMap();
-class QueryError extends OrchidOrmInternalError {
-  get isUnique() {
-    return this.code === "23505";
-  }
-  get columns() {
-    if (this.columnsCache) return this.columnsCache;
-    const columns = {};
-    if (this.detail) {
-      const list = this.detail.match(/\((.*)\)=/)?.[1];
-      if (list) {
-        list.split(", ").forEach((item) => {
-          const column = item.startsWith('"') ? item.slice(1, -1) : item;
-          const key = this.query.columnNameToKey(column) ?? column;
-          columns[key] = true;
-        });
-      }
-    }
-    return this.columnsCache = columns;
-  }
-}
-class MoreThanOneRowError extends OrchidOrmInternalError {
-  constructor(query, message) {
-    super(query, message);
-  }
-}
-class UnhandledTypeError extends OrchidOrmInternalError {
-  constructor(query, value) {
-    super(query, `Unhandled type: ${JSON.stringify(value)} received`);
-  }
-}
-
 const pushWhereStatementSql = (ctx, table, query, quotedAs) => {
   const res = whereToSql(ctx, table, query, quotedAs);
   if (res) {
@@ -2892,7 +2826,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
         const q = item.useOuterAliases ? {
           joinedShapes: query.joinedShapes,
-          aliases: query.outerAliases,
+          aliases: orchidCore._getQueryOuterAliases(query),
           shape: query.shape
         } : query;
         ands.push(
@@ -3018,7 +2952,10 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
   if ("l" in args) {
     const { aliasValue } = ctx;
     ctx.aliasValue = true;
-    target = `(${getSqlText(args.l.toSQL(ctx))}) "${query.aliases?.[args.a] || args.a}"`;
+    target = `(${getSqlText(args.l.toSQL(ctx))}) "${orchidCore._getQueryAliasOrName(
+      query,
+      args.a
+    )}"`;
     on = `${args.i ? `"${args.a}".r IS NOT NULL` : "true"}`;
     ctx.aliasValue = aliasValue;
   } else if ("j" in args) {
@@ -3359,7 +3296,7 @@ const noneResult = (q, queryData, type) => {
   } else if (type === "valueOrThrow" && queryData.returning) {
     return 0;
   } else {
-    throw new NotFoundError(q);
+    throw new orchidCore.NotFoundError(q);
   }
 };
 const noneMethods = {
@@ -3397,7 +3334,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q = getClonedQueryData(q.q);
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
-      qb.q.outerAliases = qb.q.aliases;
+      orchidCore._setSubQueryAliases(qb);
       args[i] = resolveSubQueryCallbackV2(qb, arg);
     }
   }
@@ -4165,42 +4102,6 @@ class Where {
   }
 }
 
-const _queryAs = (self, as) => {
-  const { q } = self;
-  q.as = as;
-  q.aliases = {
-    ...q.aliases,
-    [as]: q.aliases ? _queryResolveAlias(q.aliases, as) : as
-  };
-  return self;
-};
-const _queryResolveAlias = (aliases, as) => {
-  if (!aliases[as]) return as;
-  let suffix = 2;
-  let privateAs;
-  while (aliases[privateAs = as + suffix]) {
-    suffix++;
-  }
-  return privateAs;
-};
-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(_clone(this), as);
-  }
-}
-
 const _chain = (fromQuery, toQuery, rel) => {
   const self = fromQuery;
   const toTable = toQuery;
@@ -4232,13 +4133,7 @@ const _chain = (fromQuery, toQuery, rel) => {
   } else {
     q.relChain = [{ query: self, rel }];
   }
-  const aliases = self.q.as ? { ...self.q.aliases } : { ...self.q.aliases, [self.table]: self.table };
-  const relAliases = q.aliases;
-  for (const as in relAliases) {
-    aliases[as] = _queryResolveAlias(aliases, as);
-  }
-  q.as = aliases[q.as];
-  q.aliases = aliases;
+  orchidCore._applyRelationAliases(self, q);
   q.joinedShapes = {
     [getQueryAs(self)]: self.q.shape,
     ...self.q.joinedShapes
@@ -4279,14 +4174,11 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
   const arg = Object.create(base);
   arg.q = getClonedQueryData(q.q);
   arg.q.subQuery = 1;
-  arg.q.relChain = void 0;
-  arg.q.outerAliases = q.q.aliases;
+  arg.q.with = arg.q.relChain = void 0;
+  orchidCore._setSubQueryAliases(arg);
   return cb(arg);
 };
-const joinSubQuery = (q, sub) => {
-  if (!("joinQuery" in sub)) return sub;
-  return sub.joinQuery(sub, q);
-};
+const joinSubQuery = (q, sub) => orchidCore.isRelationQuery(sub) ? sub.joinQuery(sub, q) : sub;
 
 const _clone = (q) => q.clone();
 const pushQueryArrayImmutable = (q, key, value) => {
@@ -4303,17 +4195,15 @@ const setQueryObjectValueImmutable = (q, object, key, value) => {
 };
 const throwIfNoWhere = (q, method) => {
   if (!q.q.or && !q.q.and && !q.q.scopes && !q.q.all) {
-    throw new OrchidOrmInternalError(
+    throw new orchidCore.OrchidOrmInternalError(
       q,
       `Dangerous ${method} without conditions`
     );
   }
 };
 const throwIfJoinLateral = (q, method) => {
-  if (q.q.join?.some(
-    (x) => Array.isArray(x) || "s" in x.args && x.args.s
-  )) {
-    throw new OrchidOrmInternalError(
+  if (q.q.join?.some((x) => Array.isArray(x) || "s" in x.args && x.args.s)) {
+    throw new orchidCore.OrchidOrmInternalError(
       q,
       `Cannot join a complex query in ${method}`
     );
@@ -4340,24 +4230,6 @@ const extendQuery = (q, methods) => {
   cloned.q = getClonedQueryData(q.q);
   return cloned;
 };
-const getPrimaryKeys = (q) => {
-  var _a;
-  return (_a = q.internal).primaryKeys ?? (_a.primaryKeys = collectPrimaryKeys(q));
-};
-const collectPrimaryKeys = (q) => {
-  const primaryKeys = [];
-  const { shape } = q.q;
-  for (const key in shape) {
-    if (shape[key].data.primaryKey) {
-      primaryKeys.push(key);
-    }
-  }
-  const pkey = q.internal.tableData.primaryKey;
-  if (pkey) {
-    primaryKeys.push(...pkey.columns);
-  }
-  return primaryKeys;
-};
 const _queryAll = (q) => {
   q.q.returnType = "all";
   q.q.all = true;
@@ -4407,7 +4279,7 @@ const _queryRows = (q) => {
 };
 const getFullColumnTable = (q, column, index, as) => {
   const table = column.slice(0, index);
-  return as && table !== as && q.q.aliases?.[table] === as ? as : table;
+  return as && table !== as && orchidCore._checkIfAliased(q, table, as) ? as : table;
 };
 
 const _join = (query, require, type, first, args) => {
@@ -4673,7 +4545,7 @@ const commitSql$1 = {
 const rollbackSql$1 = {
   text: "ROLLBACK"
 };
-class AfterCommitError extends OrchidOrmError {
+class AfterCommitError extends orchidCore.OrchidOrmError {
   constructor(result, hookResults) {
     super("After commit hooks have failed");
     this.result = result;
@@ -5155,7 +5027,7 @@ function maybeWrappedThen(resolve, reject) {
     }
   }
   const trx = this.internal.transactionStorage.getStore();
-  if ((q.wrapInTransaction || afterHooks) && !trx) {
+  if ((q.wrapInTransaction || q.selectRelation && q.type || afterHooks) && !trx) {
     return this.transaction(
       () => new Promise((resolve2, reject2) => {
         const trx2 = this.internal.transactionStorage.getStore();
@@ -5191,6 +5063,7 @@ const callAfterHook = function(cb) {
 };
 const beginSql = { text: "BEGIN" };
 const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
+  var _a;
   const { q: query } = q;
   let sql;
   let logData;
@@ -5206,9 +5079,9 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       );
     }
     sql = q.toSQL();
-    const { hookSelect } = sql;
+    const { hookSelect, delayedRelationSelect } = sql;
     const { returnType = "all" } = query;
-    const tempReturnType = hookSelect || returnType === "rows" && q.q.batchParsers ? "all" : returnType;
+    const tempReturnType = hookSelect || returnType === "rows" && q.q.batchParsers || delayedRelationSelect?.value ? "all" : returnType;
     let result;
     let queryResult;
     if ("text" in sql) {
@@ -5340,6 +5213,51 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         await Promise.all(query.after.map(callAfterHook, args));
       }
     }
+    if (delayedRelationSelect?.value) {
+      const q2 = delayedRelationSelect.query;
+      const primaryKeys = orchidCore.requirePrimaryKeys(
+        q2,
+        "Cannot select a relation of a table that has no primary keys"
+      );
+      const selectQuery = q2.clone();
+      selectQuery.q.type = selectQuery.q.returnType = void 0;
+      ((_a = selectQuery.q).and ?? (_a.and = [])).push(orchidCore.pick(result, primaryKeys));
+      const relationsSelect = delayedRelationSelect.value;
+      let selectAs;
+      if (renames) {
+        selectAs = {};
+        for (const key in renames) {
+          if (key in relationsSelect) {
+            selectAs[renames[key]] = relationsSelect[key];
+          }
+        }
+      } else {
+        selectAs = { ...relationsSelect };
+      }
+      const select = [{ selectAs }];
+      const relationKeyAliases = primaryKeys.map((key) => {
+        if (key in selectAs) {
+          const as = orchidCore.getFreeAlias(selectAs, key);
+          selectAs[as] = key;
+          return as;
+        } else {
+          select.push(key);
+          return key;
+        }
+      });
+      selectQuery.q.select = select;
+      const relationsResult = await selectQuery;
+      for (const row of result) {
+        const relationRow = relationsResult.find((relationRow2) => {
+          return !primaryKeys.some(
+            (key, i) => relationRow2[relationKeyAliases[i]] !== row[key]
+          );
+        });
+        if (relationRow) {
+          Object.assign(row, relationRow);
+        }
+      }
+    }
     if (hookSelect || tempReturnType !== returnType) {
       if (renames) {
         for (const a in renames) {
@@ -5431,7 +5349,7 @@ const handleResult = (q, returnType, result, isSubQuery) => {
   switch (returnType) {
     case "all": {
       if (q.q.throwOnNotFound && result.rows.length === 0)
-        throw new NotFoundError(q);
+        throw new orchidCore.NotFoundError(q);
       const promise = parseBatch(q, result);
       const { rows } = result;
       if (parsers) {
@@ -5450,7 +5368,7 @@ const handleResult = (q, returnType, result, isSubQuery) => {
     }
     case "oneOrThrow": {
       const { rows } = result;
-      if (!rows.length) throw new NotFoundError(q);
+      if (!rows.length) throw new orchidCore.NotFoundError(q);
       const promise = parseBatch(q, result);
       if (parsers) parseRecord(parsers, rows[0]);
       return promise ? promise.then(() => rows[0]) : rows[0];
@@ -5493,7 +5411,7 @@ const handleResult = (q, returnType, result, isSubQuery) => {
     case "valueOrThrow": {
       if (q.q.returning) {
         if (q.q.throwOnNotFound && result.rowCount === 0) {
-          throw new NotFoundError(q);
+          throw new orchidCore.NotFoundError(q);
         }
         return result.rowCount;
       }
@@ -5501,11 +5419,11 @@ const handleResult = (q, returnType, result, isSubQuery) => {
       const promise = parseBatch(q, result);
       if (promise) {
         return promise.then(() => {
-          if (rows[0]?.[0] === void 0) throw new NotFoundError(q);
+          if (rows[0]?.[0] === void 0) throw new orchidCore.NotFoundError(q);
           return parseValue(rows[0][0], parsers);
         });
       }
-      if (rows[0]?.[0] === void 0) throw new NotFoundError(q);
+      if (rows[0]?.[0] === void 0) throw new orchidCore.NotFoundError(q);
       return parseValue(rows[0][0], parsers);
     }
     case "void": {
@@ -5564,7 +5482,7 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
   if (returnType === "oneOrThrow" || returnType === "one") {
     let row = result[0];
     if (!row) {
-      if (returnType === "oneOrThrow") throw new NotFoundError(q);
+      if (returnType === "oneOrThrow") throw new orchidCore.NotFoundError(q);
       return void 0;
     } else if (!tempColumns?.size) {
       return row;
@@ -5584,7 +5502,7 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
       return queryResult.rowCount;
     }
     const row = result[0];
-    if (!row) throw new NotFoundError(q);
+    if (!row) throw new orchidCore.NotFoundError(q);
     return row[getFirstResultKey(q, queryResult)];
   }
   if (returnType === "pluck") {
@@ -5749,7 +5667,7 @@ class FromMethods {
 }
 
 function queryWrap(self, query, as = "t") {
-  return _queryAs(queryFrom(query, self), as);
+  return orchidCore._setQueryAs(queryFrom(query, self), as);
 }
 function cloneQueryBaseUnscoped(query) {
   const q = query.baseQuery.clone();
@@ -5835,7 +5753,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                   }
                 } else {
                   for (const { data } of batches) {
-                    if (!data) throw new NotFoundError(arg);
+                    if (!data) throw new orchidCore.NotFoundError(arg);
                     parseRecord(parsers, data);
                   }
                 }
@@ -5845,7 +5763,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 }
               } else {
                 for (const { data } of batches) {
-                  if (!data) throw new NotFoundError(arg);
+                  if (!data) throw new orchidCore.NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -5877,13 +5795,13 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 } else {
                   for (const item of batches) {
                     if (item.data === void 0)
-                      throw new NotFoundError(arg);
+                      throw new orchidCore.NotFoundError(arg);
                     item.parent[item.key] = item.data = parse(item.data);
                   }
                 }
               } else if (returnType !== "value") {
                 for (const { data } of batches) {
-                  if (data === void 0) throw new NotFoundError(arg);
+                  if (data === void 0) throw new orchidCore.NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -5986,11 +5904,11 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
+  const query = q;
   if (typeof arg === "string") {
     return setParserForSelectedString(q, arg, as, columnAs);
   }
   const selectAs = {};
-  let aliases;
   for (const key in arg) {
     let value = arg[key];
     let joinQuery;
@@ -6001,18 +5919,18 @@ const processSelectArg = (q, as, arg, columnAs) => {
           return false;
         }
       }
-      if (!orchidCore.isExpression(value) && value.joinQuery) {
-        joinQuery = true;
+      if (!orchidCore.isExpression(value) && orchidCore.isRelationQuery(value)) {
+        query.q.selectRelation = joinQuery = true;
         value = value.joinQuery(value, q);
-        let query;
+        let subQuery;
         const { returnType, innerJoinLateral } = value.q;
         if (!returnType || returnType === "all") {
-          query = value.json(false);
+          subQuery = value.json(false);
           if (!innerJoinLateral) {
             value.q.coalesceValue = emptyArrSQL;
           }
         } else if (returnType === "pluck") {
-          query = value.q.select ? value.wrap(cloneQueryBaseUnscoped(value)).jsonAgg(value.q.select[0]) : value.json(false);
+          subQuery = value.q.select ? value.wrap(cloneQueryBaseUnscoped(value)).jsonAgg(value.q.select[0]) : value.json(false);
           value.q.coalesceValue = emptyArrSQL;
         } else {
           if (returnType === "value" || returnType === "valueOrThrow") {
@@ -6022,23 +5940,23 @@ const processSelectArg = (q, as, arg, columnAs) => {
                   selectAs: { r: value.q.select[0] }
                 };
               }
-              query = value;
+              subQuery = value;
             } else {
-              query = value.json(false);
+              subQuery = value.json(false);
             }
           } else {
-            query = value;
+            subQuery = value;
           }
         }
-        const asOverride = value.q.aliases[key] ?? key;
-        value.q.joinedForSelect = asOverride;
-        if (asOverride !== key) {
-          aliases = { ...q.q.aliases, [key]: asOverride };
-        }
+        value.q.joinedForSelect = orchidCore._copyQueryAliasToQuery(
+          value,
+          q,
+          key
+        );
         _joinLateral(
           q,
           innerJoinLateral ? "JOIN" : "LEFT JOIN",
-          query,
+          subQuery,
           key,
           // no need for `ON p.r IS NOT NULL` check when joining a single record,
           // `JOIN` will handle it on itself.
@@ -6046,7 +5964,6 @@ const processSelectArg = (q, as, arg, columnAs) => {
         );
       }
     }
-    if (aliases) q.q.aliases = aliases;
     selectAs[key] = addParserForSelectItem(
       q,
       as,
@@ -6463,6 +6380,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
     }
   }
   const insertSql = `INSERT INTO ${quotedAs}${quotedColumns.length ? "(" + quotedColumns.join(", ") + ")" : ""}`;
+  const hasNonSelect = ctx.hasNonSelect;
   if ("from" in values && query.insertWith) {
     pushWithSql(ctx, Object.values(query.insertWith).flat());
   }
@@ -6521,6 +6439,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
   }
   pushWhereStatementSql(ctx, q, query, quotedAs);
   let returning;
+  let delayedRelationSelect;
   if (inCTE) {
     const select = inCTE.returning?.select;
     returning = {
@@ -6528,7 +6447,15 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
       hookSelect: inCTE.returning?.hookSelect
     };
   } else {
-    returning = makeReturningSql(ctx, q, query, quotedAs, 2);
+    delayedRelationSelect = q.q.selectRelation ? orchidCore.newDelayedRelationSelect(q) : void 0;
+    returning = makeReturningSql(
+      ctx,
+      q,
+      query,
+      quotedAs,
+      delayedRelationSelect,
+      2
+    );
   }
   if (returning.select) ctx.sql.push("RETURNING", returning.select);
   if ("from" in values) {
@@ -6551,7 +6478,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
         )
       );
     }
-    ctx.sql[valuesPos] = getSqlText(toSQL(q2, { values: ctx.values }));
+    ctx.sql[valuesPos] = getSqlText(toSQL(q2, ctx));
   } else {
     const valuesSql = [];
     let ctxValues = ctx.values;
@@ -6608,6 +6535,12 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
       ctx.sql[valuesPos - 1] = "WITH " + withSqls.join(", ") + " " + insertSql;
     }
     if (batch) {
+      if (hasNonSelect) {
+        throw new orchidCore.OrchidOrmInternalError(
+          q,
+          `Cannot insert many records when having a non-select sub-query`
+        );
+      }
       ctx.sql[valuesPos] = (inCTE ? "SELECT " : "VALUES ") + valuesSql.join(", ");
       batch.push({
         text: ctx.sql.join(" "),
@@ -6615,6 +6548,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
       });
       return {
         hookSelect: returning.hookSelect,
+        delayedRelationSelect,
         batch
       };
     } else {
@@ -6626,6 +6560,7 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
   }
   return {
     hookSelect: returning.hookSelect,
+    delayedRelationSelect,
     text: ctx.sql.join(" "),
     values: ctx.values
   };
@@ -6797,7 +6732,7 @@ const hookSelectKeys = [
   "afterCreateSelect",
   "afterDeleteSelect"
 ];
-const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) => {
+const makeReturningSql = (ctx, q, data, quotedAs, delayedRelationSelect, hookSelectI, addHookSelectI) => {
   if (data.inCTE) {
     if (hookSelectI !== 2) {
       const returning = makeReturningSql(
@@ -6805,6 +6740,7 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
         q,
         data,
         quotedAs,
+        delayedRelationSelect,
         2,
         hookSelectI
       );
@@ -6826,7 +6762,7 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
   }
   const otherCTEHookSelect = addHookSelectI && data[hookSelectKeys[addHookSelectI]];
   let tempSelect;
-  if (q.q.hookSelect || hookSelect || otherCTEHookSelect) {
+  if (q.q.hookSelect || hookSelect || otherCTEHookSelect || q.q.selectRelation) {
     tempSelect = new Map(q.q.hookSelect);
     if (hookSelect) {
       for (const column of hookSelect) {
@@ -6838,12 +6774,30 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
         tempSelect.set(column, { select: column });
       }
     }
+    if (q.q.selectRelation) {
+      for (const column of orchidCore.getPrimaryKeys(q)) {
+        tempSelect.set(column, { select: column });
+      }
+    }
   }
   let sql;
   if (tempSelect?.size || select?.length) {
-    sql = selectToSql(ctx, q, data, quotedAs, tempSelect, void 0, true);
+    sql = selectToSql(
+      ctx,
+      q,
+      data,
+      quotedAs,
+      tempSelect,
+      void 0,
+      true,
+      void 0,
+      delayedRelationSelect
+    );
   }
-  return { select: sql, hookSelect: tempSelect };
+  return {
+    select: sql,
+    hookSelect: tempSelect
+  };
 };
 
 const pushSelectSql = (ctx, table, query, quotedAs, aliases) => {
@@ -6862,13 +6816,14 @@ const pushSelectSql = (ctx, table, query, quotedAs, aliases) => {
     if (sql) ctx.sql.push(sql);
   }
 };
-const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE, jsonList) => {
+const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE, jsonList, delayedRelationSelect) => {
   if (query.inCTE && !skipCTE) {
     const { select } = makeReturningSql(
       ctx,
       table,
       query,
-      quotedAs
+      quotedAs,
+      query.inCTE.delayedRelationSelect
     );
     return query.inCTE.selectNum || !select ? select ? "0, " + select : "0" : select;
   }
@@ -6942,6 +6897,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
                   jsonList[as] = value.result.value;
                 }
                 aliases?.push(as);
+              } else if (delayedRelationSelect && orchidCore.isRelationQuery(value)) {
+                orchidCore.setDelayedRelation(delayedRelationSelect, as, value);
               } else {
                 pushSubQuerySql(ctx, query, value, as, list, quotedAs, aliases);
                 if (jsonList) {
@@ -7059,7 +7016,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
         sql = `'[]'::json`;
         break;
       default:
-        throw new UnhandledTypeError(query, returnType);
+        throw new orchidCore.UnhandledTypeError(query, returnType);
     }
     list.push(`${sql} "${as}"`);
     aliases?.push(as);
@@ -7088,7 +7045,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
       case "void":
         return;
       default:
-        throw new UnhandledTypeError(query, returnType);
+        throw new orchidCore.UnhandledTypeError(query, returnType);
     }
     if (sql) {
       list.push(`${coalesce(ctx, query, sql, quotedAs)} "${as}"`);
@@ -7108,7 +7065,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
       if (!first && query.q.computeds?.[as]) {
         query = queryJson(query);
       } else if (!first) {
-        throw new OrchidOrmInternalError(
+        throw new orchidCore.OrchidOrmInternalError(
           query,
           `Nothing was selected for pluck`
         );
@@ -7130,7 +7087,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
     case "void":
       break;
     default:
-      throw new UnhandledTypeError(query, returnType);
+      throw new orchidCore.UnhandledTypeError(query, returnType);
   }
   list.push(
     `${coalesce(
@@ -7304,6 +7261,14 @@ const fromToSql = (ctx, data, from, quotedAs) => {
       fromQuery = from;
     }
   } else {
+    if (data.with) {
+      for (const w of data.with) {
+        if (w?.n === from && w.q?.q.inCTE) {
+          ctx.delayedRelationSelect = w.q.q.inCTE.delayedRelationSelect;
+          break;
+        }
+      }
+    }
     sql = quoteSchemaAndTable(data.schema, from);
   }
   return (only === void 0 ? data.only : only) ? `ONLY ${sql}` : sql;
@@ -7383,38 +7348,55 @@ const pushUpdateSql = (ctx, table, query, quotedAs) => {
   if (query.hookUpdateSet) {
     applySet(ctx, table, set, hookSet, orchidCore.emptyObject, quotedAs);
   }
+  let hookSelect;
+  const delayedRelationSelect = query.selectRelation ? orchidCore.newDelayedRelationSelect(table) : void 0;
   if (!set.length) {
     if (!query.select) {
       query.select = countSelect;
     }
-    const hookSelect = pushUpdateReturning(
+    hookSelect = pushUpdateReturning(
       ctx,
       table,
       query,
       quotedAs,
-      "SELECT"
+      "SELECT",
+      delayedRelationSelect
     );
     ctx.sql.push(`FROM ${quotedTable}`);
     pushWhereStatementSql(ctx, table, query, quotedAs);
     pushLimitSQL(ctx.sql, ctx.values, query);
-    return hookSelect;
-  }
-  ctx.sql.push(`UPDATE ${quotedTable}`);
-  if (quotedTable !== quotedAs) {
-    ctx.sql.push(quotedAs);
+  } else {
+    ctx.sql.push(`UPDATE ${quotedTable}`);
+    if (quotedTable !== quotedAs) {
+      ctx.sql.push(quotedAs);
+    }
+    ctx.sql.push("SET");
+    ctx.sql.push(set.join(", "));
+    pushWhereStatementSql(ctx, table, query, quotedAs);
+    hookSelect = pushUpdateReturning(
+      ctx,
+      table,
+      query,
+      quotedAs,
+      "RETURNING",
+      delayedRelationSelect
+    );
   }
-  ctx.sql.push("SET");
-  ctx.sql.push(set.join(", "));
-  pushWhereStatementSql(ctx, table, query, quotedAs);
-  return pushUpdateReturning(ctx, table, query, quotedAs, "RETURNING");
+  return {
+    hookSelect,
+    delayedRelationSelect,
+    text: ctx.sql.join(" "),
+    values: ctx.values
+  };
 };
-const pushUpdateReturning = (ctx, table, query, quotedAs, keyword) => {
+const pushUpdateReturning = (ctx, table, query, quotedAs, keyword, delayedRelationSelect) => {
   const { inCTE } = query;
   const { select, hookSelect } = makeReturningSql(
     ctx,
     table,
     query,
     quotedAs,
+    delayedRelationSelect,
     1,
     inCTE && 2
   );
@@ -7482,8 +7464,12 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
     const ons = [];
     const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
     for (const item of query.join) {
-      if (Array.isArray(item)) {
-        throw new OrchidOrmInternalError(
+      const lateral = "l" in item.args && item.args.l;
+      if (lateral) {
+        if (orchidCore.isRelationQuery(lateral)) {
+          continue;
+        }
+        throw new orchidCore.OrchidOrmInternalError(
           table,
           "Join lateral is not supported in delete"
         );
@@ -7510,9 +7496,22 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
       ctx.sql.push("WHERE", conditions);
     }
   }
-  const returning = makeReturningSql(ctx, table, query, quotedAs, 3);
+  const delayedRelationSelect = query.selectRelation ? orchidCore.newDelayedRelationSelect(table) : void 0;
+  const returning = makeReturningSql(
+    ctx,
+    table,
+    query,
+    quotedAs,
+    delayedRelationSelect,
+    3
+  );
   if (returning.select) ctx.sql.push("RETURNING", returning.select);
-  return returning.hookSelect;
+  return {
+    hookSelect: returning.hookSelect,
+    delayedRelationSelect,
+    text: ctx.sql.join(" "),
+    values: ctx.values
+  };
 };
 
 const pushTruncateSql = (ctx, table, query) => {
@@ -7584,126 +7583,137 @@ const toSQL = (table, options) => {
     sql,
     values,
     aliasValue: options?.aliasValue,
-    skipBatchCheck: options?.skipBatchCheck
+    skipBatchCheck: options?.skipBatchCheck,
+    hasNonSelect: options?.hasNonSelect
   };
   if (query.with) {
     pushWithSql(ctx, query.with);
   }
+  let result;
   let fromQuery;
   if (query.type && query.type !== "upsert") {
     const tableName = table.table ?? query.as;
     if (!tableName) throw new Error(`Table is missing for ${query.type}`);
     if (query.type === "truncate") {
       pushTruncateSql(ctx, tableName, query);
-      return { text: sql.join(" "), values };
-    }
-    if (query.type === "columnInfo") {
+      result = { text: sql.join(" "), values };
+    } else if (query.type === "columnInfo") {
       pushColumnInfoSql(ctx, table, query);
-      return { text: sql.join(" "), values };
-    }
-    const quotedAs2 = `"${query.as || tableName}"`;
-    if (query.type === "insert") {
-      return makeInsertSql(ctx, table, query, `"${tableName}"`);
-    }
-    if (query.type === "update") {
-      return {
-        hookSelect: pushUpdateSql(ctx, table, query, quotedAs2),
-        text: sql.join(" "),
-        values
-      };
-    }
-    if (query.type === "delete") {
-      return {
-        hookSelect: pushDeleteSql(ctx, table, query, quotedAs2),
-        text: sql.join(" "),
-        values
-      };
-    }
-    if (query.type === "copy") {
-      pushCopySql(ctx, table, query, quotedAs2);
-      return { text: sql.join(" "), values };
-    }
-  }
-  const quotedAs = (query.as || table.table) && `"${query.as || table.table}"`;
-  if (query.union) {
-    const s = getSqlText(toSQL(query.union.b, { values }));
-    sql.push(query.union.p ? s : `(${s})`);
-    for (const u of query.union.u) {
-      const s2 = orchidCore.isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : getSqlText(toSQL(u.a, { values }));
-      sql.push(`${u.k} ${u.p ? s2 : "(" + s2 + ")"}`);
+      result = { text: sql.join(" "), values };
+    } else {
+      const quotedAs = `"${query.as || tableName}"`;
+      if (query.type === "insert") {
+        result = makeInsertSql(ctx, table, query, `"${tableName}"`);
+      } else if (query.type === "update") {
+        result = pushUpdateSql(ctx, table, query, quotedAs);
+      } else if (query.type === "delete") {
+        result = pushDeleteSql(ctx, table, query, quotedAs);
+      } else if (query.type === "copy") {
+        pushCopySql(ctx, table, query, quotedAs);
+        result = { text: sql.join(" "), values };
+      } else {
+        throw new Error(`Unsupported query type ${query.type}`);
+      }
     }
   } else {
-    sql.push("SELECT");
-    if (query.distinct) {
-      pushDistinctSql(ctx, table, query.distinct, quotedAs);
-    }
-    const aliases = query.group ? [] : void 0;
-    pushSelectSql(ctx, table, query, quotedAs, aliases);
-    fromQuery = (table.table || query.from) && pushFromAndAs(ctx, table, query, quotedAs) || void 0;
-    if (query.join) {
-      pushJoinSql(
-        ctx,
-        table,
-        query,
-        quotedAs
-      );
-    }
-    if (query.and || query.or || query.scopes) {
-      pushWhereStatementSql(ctx, table, query, quotedAs);
-    }
-    if (query.group) {
-      const group = query.group.map((item) => {
-        if (orchidCore.isExpression(item)) {
-          return item.toSQL(ctx, quotedAs);
-        } else {
-          const i = aliases.indexOf(item);
-          return i !== -1 ? i + 1 : columnToSql(ctx, table.q, table.shape, item, quotedAs);
-        }
-      });
-      sql.push(`GROUP BY ${group.join(", ")}`);
-    }
-    if (query.having) pushHavingSql(ctx, query, quotedAs);
-    if (query.window) {
-      const window = [];
-      for (const item of query.window) {
-        for (const key in item) {
-          window.push(
-            `"${key}" AS ${windowToSql(ctx, query, item[key], quotedAs)}`
-          );
+    const quotedAs = (query.as || table.table) && `"${query.as || table.table}"`;
+    if (query.union) {
+      const firstSql = toSQL(query.union.b, ctx);
+      ctx.delayedRelationSelect = firstSql.delayedRelationSelect;
+      const s = getSqlText(firstSql);
+      sql.push(query.union.p ? s : `(${s})`);
+      for (const u of query.union.u) {
+        const s2 = orchidCore.isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : getSqlText(toSQL(u.a, ctx));
+        sql.push(`${u.k} ${u.p ? s2 : "(" + s2 + ")"}`);
+      }
+    } else {
+      sql.push("SELECT");
+      if (query.distinct) {
+        pushDistinctSql(ctx, table, query.distinct, quotedAs);
+      }
+      const aliases = query.group ? [] : void 0;
+      pushSelectSql(ctx, table, query, quotedAs, aliases);
+      fromQuery = (table.table || query.from) && pushFromAndAs(ctx, table, query, quotedAs) || void 0;
+      if (query.join) {
+        pushJoinSql(
+          ctx,
+          table,
+          query,
+          quotedAs
+        );
+      }
+      if (query.and || query.or || query.scopes) {
+        pushWhereStatementSql(ctx, table, query, quotedAs);
+      }
+      if (query.group) {
+        const group = query.group.map((item) => {
+          if (orchidCore.isExpression(item)) {
+            return item.toSQL(ctx, quotedAs);
+          } else {
+            const i = aliases.indexOf(item);
+            return i !== -1 ? i + 1 : columnToSql(
+              ctx,
+              table.q,
+              table.shape,
+              item,
+              quotedAs
+            );
+          }
+        });
+        sql.push(`GROUP BY ${group.join(", ")}`);
+      }
+      if (query.having) pushHavingSql(ctx, query, quotedAs);
+      if (query.window) {
+        const window = [];
+        for (const item of query.window) {
+          for (const key in item) {
+            window.push(
+              `"${key}" AS ${windowToSql(ctx, query, item[key], quotedAs)}`
+            );
+          }
         }
+        sql.push(`WINDOW ${window.join(", ")}`);
       }
-      sql.push(`WINDOW ${window.join(", ")}`);
     }
-  }
-  if (query.order) {
-    pushOrderBySql(ctx, query, quotedAs, query.order);
-  }
-  if (query.useFromLimitOffset) {
-    const q = fromQuery?.q;
-    if (q.limit) {
-      sql.push(`LIMIT ${orchidCore.addValue(values, q.limit)}`);
+    if (query.order) {
+      pushOrderBySql(ctx, query, quotedAs, query.order);
     }
-    if (q.offset) {
-      sql.push(`OFFSET ${orchidCore.addValue(values, q.offset)}`);
-    }
-  } else {
-    pushLimitSQL(sql, values, query);
-    if (query.offset && !query.returnsOne) {
-      sql.push(`OFFSET ${orchidCore.addValue(values, query.offset)}`);
+    if (query.useFromLimitOffset) {
+      const q = fromQuery?.q;
+      if (q.limit) {
+        sql.push(`LIMIT ${orchidCore.addValue(values, q.limit)}`);
+      }
+      if (q.offset) {
+        sql.push(`OFFSET ${orchidCore.addValue(values, q.offset)}`);
+      }
+    } else {
+      pushLimitSQL(sql, values, query);
+      if (query.offset && !query.returnsOne) {
+        sql.push(`OFFSET ${orchidCore.addValue(values, query.offset)}`);
+      }
+    }
+    if (query.for) {
+      sql.push("FOR", query.for.type);
+      const { tableNames } = query.for;
+      if (tableNames) {
+        sql.push(
+          "OF",
+          orchidCore.isExpression(tableNames) ? tableNames.toSQL(ctx, quotedAs) : tableNames.map((x) => `"${x}"`).join(", ")
+        );
+      }
+      if (query.for.mode) sql.push(query.for.mode);
     }
+    result = {
+      text: sql.join(" "),
+      values,
+      hookSelect: query.hookSelect,
+      delayedRelationSelect: ctx.delayedRelationSelect
+    };
   }
-  if (query.for) {
-    sql.push("FOR", query.for.type);
-    const { tableNames } = query.for;
-    if (tableNames) {
-      sql.push(
-        "OF",
-        orchidCore.isExpression(tableNames) ? tableNames.toSQL(ctx, quotedAs) : tableNames.map((x) => `"${x}"`).join(", ")
-      );
-    }
-    if (query.for.mode) sql.push(query.for.mode);
+  if (options && (query.type || ctx.hasNonSelect)) {
+    options.hasNonSelect = true;
   }
-  return { text: sql.join(" "), values, hookSelect: query.hookSelect };
+  return result;
 };
 function pushLimitSQL(sql, values, q) {
   if (!q.returnsOne) {
@@ -8530,6 +8540,24 @@ class AggregateMethods {
   }
 }
 
+class QueryAsMethods {
+  /**
+   * 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 orchidCore._setQueryAs(_clone(this), as);
+  }
+}
+
 class Clear {
   clear(...clears) {
     const q = _clone(this);
@@ -8573,7 +8601,7 @@ const _queryUnion = (base, args, k, p, m) => {
       m
     })
   );
-  const q = query.q;
+  const { q } = query;
   const baseQ = base.q;
   q.union = baseQ.union ? {
     ...baseQ.union,
@@ -8727,7 +8755,7 @@ const addWith = (q, withStore, item, key = "with") => {
   }
   orchidCore.pushOrNewArrayToObjectImmutable(withStore, key, item);
 };
-const moveQueryValueToWith = (q, withStore, value, set, key, withKey) => {
+const moveQueryValueToWith = (q, withStore, value, withKey, set, key) => {
   if (value.q.type) {
     const as = saveAliasedShape(q, "q", "withShapes");
     addWith(
@@ -8739,8 +8767,12 @@ const moveQueryValueToWith = (q, withStore, value, set, key, withKey) => {
       },
       withKey
     );
-    set[key] = new RawSQL(`(SELECT * FROM "${as}")`);
+    if (set) {
+      set[key] = new RawSQL(`(SELECT * FROM "${as}")`);
+    }
+    return as;
   }
+  return;
 };
 class WithMethods {
   with(name, second, third) {
@@ -8839,9 +8871,9 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
           q,
           (_a = q.q).insertWith ?? (_a.insertWith = {}),
           value,
+          rowIndex,
           item,
-          key,
-          rowIndex
+          key
         );
       }
     }
@@ -8853,7 +8885,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
 };
 const throwOnReadOnly$1 = (q, column, key) => {
   if (column.data.appReadOnly || column.data.readOnly) {
-    throw new OrchidOrmInternalError(
+    throw new orchidCore.OrchidOrmInternalError(
       q,
       "Trying to insert a readonly column",
       { column: key }
@@ -9733,9 +9765,7 @@ const _queryHookBeforeCreate = (q, cb) => {
   return before(
     q,
     "Create",
-    (q2) => cb(
-      new orchidCore.QueryHookUtils(q2, q2.q.columns, "hookCreateSet")
-    )
+    (q2) => cb(new orchidCore.QueryHookUtils(q2, q2.q.columns, "hookCreateSet"))
   );
 };
 const _queryHookAfterCreate = (q, select, cb) => {
@@ -10817,7 +10847,7 @@ class MergeQueryMethods {
 
 const throwOnReadOnly = (q, column, key) => {
   if (column.data.appReadOnly || column.data.readOnly) {
-    throw new OrchidOrmInternalError(
+    throw new orchidCore.OrchidOrmInternalError(
       q,
       "Trying to update a readonly column",
       { column: key }
@@ -10855,19 +10885,10 @@ const _queryChangeCounter = (self, op, data) => {
   orchidCore.pushQueryValueImmutable(self, "updateData", map);
   return self;
 };
-const update = (self) => {
-  const q = self.q;
-  q.type = "update";
-  if (!q.select) {
-    q.returningMany = !q.returnType || q.returnType === "all";
-    q.returnType = "valueOrThrow";
-    q.returning = true;
-  }
-  throwIfNoWhere(self, "update");
-  return self;
-};
 const _queryUpdate = (query, arg) => {
   const { q } = query;
+  q.type = "update";
+  const returnCount = !q.select;
   const set = { ...arg };
   orchidCore.pushQueryValueImmutable(query, "updateData", set);
   const { shape } = q;
@@ -10888,7 +10909,7 @@ const _queryUpdate = (query, arg) => {
           value
         );
         if (value instanceof Db && value.q.type && value.q.subQuery) {
-          throw new OrchidOrmInternalError(
+          throw new orchidCore.OrchidOrmInternalError(
             value,
             `Only selecting queries are allowed inside a callback of update, ${value.q.type} is given instead.`
           );
@@ -10901,9 +10922,9 @@ const _queryUpdate = (query, arg) => {
             query,
             q,
             value,
+            "with",
             set,
-            key,
-            "with"
+            key
           );
         } else {
           const encode = item?.data.encode;
@@ -10914,17 +10935,25 @@ const _queryUpdate = (query, arg) => {
   }
   const { queries } = ctx;
   if (queries) {
+    const primaryKeys = orchidCore.requirePrimaryKeys(
+      query,
+      "Cannot perform complex update on a table without primary keys"
+    );
+    const hookSelect = q.hookSelect = new Map(q.hookSelect);
+    for (const column of primaryKeys) {
+      hookSelect.set(column, { select: column });
+    }
     q.patchResult = async (_, _h, queryResult) => {
       await Promise.all(queries.map(orchidCore.callWithThis, queryResult));
       if (ctx.collect) {
         const t = query.baseQuery.clone();
-        const { keys } = ctx.collect;
         _queryWhereIn(
           t,
-          keys,
-          queryResult.rows.map((item) => keys.map((key) => item[key]))
+          true,
+          primaryKeys,
+          queryResult.rows.map((item) => primaryKeys.map((key) => item[key]))
         );
-        _queryUpdate(
+        await _queryUpdate(
           t,
           ctx.collect.data
         );
@@ -10934,7 +10963,13 @@ const _queryUpdate = (query, arg) => {
       }
     };
   }
-  return update(query);
+  if (returnCount) {
+    q.returningMany = !q.returnType || q.returnType === "all";
+    q.returnType = "valueOrThrow";
+    q.returning = true;
+  }
+  throwIfNoWhere(query, "update");
+  return query;
 };
 const _queryUpdateOrThrow = (q, arg) => {
   q.q.throwOnNotFound = true;
@@ -11277,7 +11312,7 @@ AggregateMethods.prototype.headline = function(search, params) {
   const q = this;
   const source = q.q.sources?.[search];
   if (!source)
-    throw new OrchidOrmInternalError(q, `Search \`${search}\` is not defined`);
+    throw new orchidCore.OrchidOrmInternalError(q, `Search \`${search}\` is not defined`);
   return new Headline(
     q.q,
     source,
@@ -11518,7 +11553,10 @@ function orCreate(query, data, updateData, mergeData) {
       }
       const inCTE = {
         selectNum: !!(hasAfterCallback || hasAfterCommitCallback),
-        targetHookSelect: hookSelect
+        targetHookSelect: hookSelect,
+        delayedRelationSelect: orchidCore.newDelayedRelationSelect(
+          query
+        )
       };
       q2 = q2.clone();
       q2.q.inCTE = inCTE;
@@ -11568,7 +11606,7 @@ function orCreate(query, data, updateData, mergeData) {
       await q22;
       created = true;
     } else if (queryResult.rowCount > 1) {
-      throw new MoreThanOneRowError(
+      throw new orchidCore.MoreThanOneRowError(
         q2,
         `Only one row was expected to find, found ${queryResult.rowCount} rows.`
       );
@@ -12154,7 +12192,7 @@ class QueryMethods {
   find(value) {
     const q = _clone(this);
     if (value === null || value === void 0) {
-      throw new OrchidOrmInternalError(
+      throw new orchidCore.OrchidOrmInternalError(
         q,
         `${value} is not allowed in the find method`
       );
@@ -12444,7 +12482,7 @@ class QueryMethods {
    */
   truncate(options) {
     const query = _clone(this);
-    const q = query.q;
+    const { q } = query;
     q.type = "truncate";
     if (options?.restartIdentity) {
       q.restartIdentity = true;
@@ -12574,11 +12612,12 @@ class QueryMethods {
    * @param fn - helper function
    */
   makeHelper(fn) {
-    const as = this.q.as || this.table;
+    const helperAs = this.q.as || this.table;
     return (query, ...args) => {
       const q = _clone(query);
-      if (q.q.as) {
-        setQueryObjectValueImmutable(q, "aliases", as, q.q.as);
+      const as = orchidCore._getQueryAs(q);
+      if (as) {
+        orchidCore._setQueryAlias(q, as, helperAs);
       }
       return fn(q, ...args);
     };
@@ -12684,7 +12723,7 @@ class QueryMethods {
 Object.assign(QueryMethods.prototype, QueryUpsert);
 Object.assign(QueryMethods.prototype, QueryOrCreate);
 orchidCore.applyMixins(QueryMethods, [
-  AsMethods,
+  QueryAsMethods,
   AggregateMethods,
   Select,
   FromMethods,
@@ -12973,7 +13012,7 @@ class Db extends QueryMethods {
         cb(this);
       }
     }
-    this.error = class extends QueryError {
+    this.error = class extends orchidCore.QueryError {
       constructor(message) {
         super(self, message);
       }
@@ -13073,7 +13112,7 @@ class Db extends QueryMethods {
             const {
               rows: [row]
             } = await performQuery(q, args, "query");
-            if (!row) throw new NotFoundError(q);
+            if (!row) throw new orchidCore.NotFoundError(q);
             return row;
           },
           async takeOptional(...args) {
@@ -13092,7 +13131,7 @@ class Db extends QueryMethods {
             const {
               rows: [row]
             } = await performQuery(q, args, "arrays");
-            if (!row) throw new NotFoundError(q);
+            if (!row) throw new orchidCore.NotFoundError(q);
             return row[0];
           },
           async getOptional(...args) {
@@ -13123,22 +13162,6 @@ class Db extends QueryMethods {
   queryArrays(...args) {
     return performQuery(this, args, "arrays");
   }
-  /**
-   * In snake case mode, or when columns have custom names,
-   * use this method to exchange a db column name to its runtime key.
-   */
-  columnNameToKey(name) {
-    let map = this.internal.columnNameToKeyMap;
-    if (!map) {
-      this.internal.columnNameToKeyMap = map = /* @__PURE__ */ new Map();
-      const { shape } = this;
-      for (const key in this.shape) {
-        const column = shape[key];
-        map.set(column.data.name ?? key, key);
-      }
-    }
-    return map.get(name);
-  }
 }
 orchidCore.applyMixins(Db, [QueryMethods]);
 Db.prototype.constructor = Db;
@@ -13351,7 +13374,6 @@ exports.Adapter = Adapter;
 exports.AfterCommitError = AfterCommitError;
 exports.AggregateMethods = AggregateMethods;
 exports.ArrayColumn = ArrayColumn;
-exports.AsMethods = AsMethods;
 exports.BigIntColumn = BigIntColumn;
 exports.BigSerialColumn = BigSerialColumn;
 exports.BitColumn = BitColumn;
@@ -13398,22 +13420,18 @@ exports.MacAddr8Column = MacAddr8Column;
 exports.MacAddrColumn = MacAddrColumn;
 exports.MergeQueryMethods = MergeQueryMethods;
 exports.MoneyColumn = MoneyColumn;
-exports.MoreThanOneRowError = MoreThanOneRowError;
-exports.NotFoundError = NotFoundError;
 exports.NumberAsStringBaseColumn = NumberAsStringBaseColumn;
 exports.NumberBaseColumn = NumberBaseColumn;
 exports.OnConflictQueryBuilder = OnConflictQueryBuilder;
 exports.OnMethods = OnMethods;
 exports.Operators = Operators;
 exports.OrExpression = OrExpression;
-exports.OrchidOrmError = OrchidOrmError;
-exports.OrchidOrmInternalError = OrchidOrmInternalError;
 exports.PathColumn = PathColumn;
 exports.PointColumn = PointColumn;
 exports.PolygonColumn = PolygonColumn;
 exports.PostgisGeographyPointColumn = PostgisGeographyPointColumn;
+exports.QueryAsMethods = QueryAsMethods;
 exports.QueryCreate = QueryCreate;
-exports.QueryError = QueryError;
 exports.QueryGet = QueryGet;
 exports.QueryHooks = QueryHooks;
 exports.QueryLog = QueryLog;
@@ -13441,7 +13459,6 @@ exports.TransformMethods = TransformMethods;
 exports.TsQueryColumn = TsQueryColumn;
 exports.TsVectorColumn = TsVectorColumn;
 exports.UUIDColumn = UUIDColumn;
-exports.UnhandledTypeError = UnhandledTypeError;
 exports.Union = Union;
 exports.UnknownColumn = UnknownColumn;
 exports.Update = Update;
@@ -13455,7 +13472,6 @@ exports._getSelectableColumn = _getSelectableColumn;
 exports._initQueryBuilder = _initQueryBuilder;
 exports._queryAfterSaveCommit = _queryAfterSaveCommit;
 exports._queryAll = _queryAll;
-exports._queryAs = _queryAs;
 exports._queryChangeCounter = _queryChangeCounter;
 exports._queryCreate = _queryCreate;
 exports._queryCreateFrom = _queryCreateFrom;
@@ -13490,7 +13506,6 @@ exports._queryJoinOnJsonPathEquals = _queryJoinOnJsonPathEquals;
 exports._queryJoinOrOn = _queryJoinOrOn;
 exports._queryOr = _queryOr;
 exports._queryOrNot = _queryOrNot;
-exports._queryResolveAlias = _queryResolveAlias;
 exports._queryRows = _queryRows;
 exports._querySelect = _querySelect;
 exports._queryTake = _queryTake;
@@ -13542,7 +13557,6 @@ exports.getColumnBaseType = getColumnBaseType;
 exports.getColumnInfo = getColumnInfo;
 exports.getColumnTypes = getColumnTypes;
 exports.getFullColumnTable = getFullColumnTable;
-exports.getPrimaryKeys = getPrimaryKeys;
 exports.getQueryAs = getQueryAs;
 exports.getShapeFromSelect = getShapeFromSelect;
 exports.getSqlText = getSqlText;