pqb 0.34.0 → 0.35.0

package/dist/index.js

@@ -90,7 +90,7 @@ class DynamicRawSQL extends orchidCore.Expression {
     super();
     this.fn = fn;
     this.result = orchidCore.emptyObject;
-    this.q = {};
+    this.q = { expr: this };
   }
   // Calls the given function to get SQL from it.
   makeSQL(ctx, quotedAs) {
@@ -119,21 +119,21 @@ const sqlFn = (...args) => {
   return (...args2) => new RawSQL(args2, arg);
 };
 
-var __defProp$h = Object.defineProperty;
+var __defProp$i = Object.defineProperty;
 var __defProps$9 = Object.defineProperties;
 var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
+var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$i = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+    if (__hasOwnProp$j.call(b, prop))
+      __defNormalProp$i(a, prop, b[prop]);
+  if (__getOwnPropSymbols$j)
+    for (var prop of __getOwnPropSymbols$j(b)) {
+      if (__propIsEnum$j.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
@@ -336,13 +336,13 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    */
   searchIndex(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadValues$h(__spreadValues$h({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      options: __spreadValues$i(__spreadValues$i({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
   unique(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadProps$9(__spreadValues$h({}, typeof args[0] === "string" ? args[1] : args[0]), {
+      options: __spreadProps$9(__spreadValues$i({}, typeof args[0] === "string" ? args[1] : args[0]), {
         unique: true
       }),
       name: typeof args[0] === "string" ? args[0] : void 0
@@ -384,21 +384,21 @@ class ColumnType extends orchidCore.ColumnTypeBase {
   }
 }
 
-var __defProp$g = Object.defineProperty;
+var __defProp$h = Object.defineProperty;
 var __defProps$8 = Object.defineProperties;
 var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$h = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$i.call(b, prop))
+      __defNormalProp$h(a, prop, b[prop]);
+  if (__getOwnPropSymbols$i)
+    for (var prop of __getOwnPropSymbols$i(b)) {
+      if (__propIsEnum$i.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
     }
   return a;
 };
@@ -418,7 +418,7 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$8(__spreadValues$g({}, params), {
+  Object.assign(column.data, __spreadProps$8(__spreadValues$h({}, params), {
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
@@ -842,21 +842,21 @@ const getSqlText = (sql) => {
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
-var __defProp$f = Object.defineProperty;
+var __defProp$g = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
 var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$g = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$h.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$h)
+    for (var prop of __getOwnPropSymbols$h(b)) {
+      if (__propIsEnum$h.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
     }
   return a;
 };
@@ -933,7 +933,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$7(__spreadValues$f({}, base), {
+const boolean = __spreadProps$7(__spreadValues$g({}, base), {
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
@@ -941,7 +941,7 @@ const boolean = __spreadProps$7(__spreadValues$f({}, base), {
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
 });
-const numeric = __spreadProps$7(__spreadValues$f({}, base), {
+const numeric = __spreadProps$7(__spreadValues$g({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue$1(value, ctx, quotedAs)}`
   ),
@@ -962,7 +962,7 @@ const numeric = __spreadProps$7(__spreadValues$f({}, base), {
     )}`
   )
 });
-const text = __spreadProps$7(__spreadValues$f({}, base), {
+const text = __spreadProps$7(__spreadValues$g({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue$1(value, ctx, quotedAs)} || '%'`
   ),
@@ -984,7 +984,7 @@ const text = __spreadProps$7(__spreadValues$f({}, base), {
 });
 const encodeJsonPath = (ctx, path) => orchidCore.addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${orchidCore.addValue(ctx.values, path)}${(options == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
-const json = __spreadProps$7(__spreadValues$f({}, base), {
+const json = __spreadProps$7(__spreadValues$g({}, base), {
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
       var _a, _b, _c, _d, _e;
@@ -1211,21 +1211,21 @@ class BigSerialColumn extends NumberAsStringBaseColumn {
   }
 }
 
-var __defProp$e = Object.defineProperty;
+var __defProp$f = Object.defineProperty;
 var __defProps$6 = Object.defineProperties;
 var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$e = (a, b) => {
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$f.call(b, prop))
-      __defNormalProp$e(a, prop, b[prop]);
-  if (__getOwnPropSymbols$f)
-    for (var prop of __getOwnPropSymbols$f(b)) {
-      if (__propIsEnum$f.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
     }
   return a;
 };
@@ -1277,7 +1277,7 @@ class StringColumn extends VarCharColumn {
   }
 }
 const textColumnToCode = (column, t, m) => {
-  const data = __spreadValues$e({}, column.data);
+  const data = __spreadValues$f({}, column.data);
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
   if (data.minArg !== void 0 && data.min === data.minArg || hasMax) {
@@ -1574,7 +1574,7 @@ class UUIDColumn extends ColumnType {
       `uuid()`,
       m,
       // don't output the default default
-      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$6(__spreadValues$e({}, data), { default: void 0 }) : data
+      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$6(__spreadValues$f({}, data), { default: void 0 }) : data
     );
   }
 }
@@ -1870,31 +1870,41 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   return `"${tableName}"."${key}"`;
 };
 const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
-  var _a, _b, _c, _d;
   const index = column.indexOf(".");
-  if (index !== -1) {
-    const table = column.slice(0, index);
-    const key = column.slice(index + 1);
-    if (key === "*") {
-      if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-        return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
-      }
-      return column;
+  return index !== -1 ? tableColumnToSqlWithAs(
+    ctx,
+    data,
+    column,
+    column.slice(0, index),
+    column.slice(index + 1),
+    quotedAs,
+    select
+  ) : ownColumnToSqlWithAs(ctx, data, column, quotedAs, select);
+};
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select) => {
+  var _a, _b, _c;
+  if (key === "*") {
+    if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
+      return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
     }
-    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
-    const quoted = `"${table}"`;
-    const col2 = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
-    if (col2) {
-      if (col2.data.name && col2.data.name !== key) {
-        return `"${tableName}"."${col2.data.name}" "${key}"`;
-      }
-      if (col2.data.computed) {
-        return `${col2.data.computed.toSQL(ctx, quoted)} "${key}"`;
-      }
+    return column;
+  }
+  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const quoted = `"${table}"`;
+  const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
+  if (col) {
+    if (col.data.name && col.data.name !== key) {
+      return `"${tableName}"."${col.data.name}" "${key}"`;
+    }
+    if (col.data.computed) {
+      return `${col.data.computed.toSQL(ctx, quoted)} "${key}"`;
     }
-    return `"${tableName}"."${key}"`;
   }
-  if (!select && ((_d = data.joinedShapes) == null ? void 0 : _d[column])) {
+  return `"${tableName}"."${key}"`;
+};
+const ownColumnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
+  var _a;
+  if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
     return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
   }
   const col = data.shape[column];
@@ -1908,11 +1918,6 @@ const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
   }
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
 };
-const ownColumnToSql = (data, column, quotedAs) => {
-  var _a;
-  const name = (_a = data.shape[column]) == null ? void 0 : _a.data.name;
-  return `${quotedAs ? `${quotedAs}.` : ""}"${name || column}"${name && name !== column ? ` "${column}"` : ""}`;
-};
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
   return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
 };
@@ -2314,21 +2319,21 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
 
-var __defProp$d = Object.defineProperty;
+var __defProp$e = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
-var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
+var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$e = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$e.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$e)
-    for (var prop of __getOwnPropSymbols$e(b)) {
-      if (__propIsEnum$e.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$f.call(b, prop))
+      __defNormalProp$e(a, prop, b[prop]);
+  if (__getOwnPropSymbols$f)
+    for (var prop of __getOwnPropSymbols$f(b)) {
+      if (__propIsEnum$f.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
     }
   return a;
 };
@@ -2394,8 +2399,8 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$5(__spreadValues$d({}, q.q), {
-          joinedShapes: __spreadProps$5(__spreadValues$d(__spreadValues$d({}, query.joinedShapes), q.q.joinedShapes), {
+        __spreadProps$5(__spreadValues$e({}, q.q), {
+          joinedShapes: __spreadProps$5(__spreadValues$e(__spreadValues$e({}, query.joinedShapes), q.q.joinedShapes), {
             [table.q.as || table.table]: table.q.shape
           })
         }),
@@ -2542,21 +2547,21 @@ const getIsJoinSubQuery = (query) => {
   return false;
 };
 
-var __defProp$c = Object.defineProperty;
+var __defProp$d = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
 var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$e.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$e)
+    for (var prop of __getOwnPropSymbols$e(b)) {
+      if (__propIsEnum$e.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
     }
   return a;
 };
@@ -2578,27 +2583,28 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
       return { w: first, a: args };
     } else {
       const joinToQ = joinTo.q;
-      const shape = (_a = joinToQ.withShapes) == null ? void 0 : _a[first];
-      if (!shape) {
-        throw new Error("Cannot get shape of `with` statement");
+      const w = (_a = joinToQ.withShapes) == null ? void 0 : _a[first];
+      if (!w) {
+        throw new Error("Cannot find a `with` statement");
       }
       const j = joinTo.queryBuilder.baseQuery.clone();
       j.table = first;
       j.q = {
-        shape,
+        shape: w.shape,
+        computeds: w.computeds,
         adapter: joinToQ.adapter,
         handleResult: joinToQ.handleResult,
         returnType: "all",
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$4(__spreadValues$c({}, joinToQ.joinedShapes), {
+      const joinedShapes = __spreadProps$4(__spreadValues$d({}, joinToQ.joinedShapes), {
         [joinToQ.as || joinTo.table]: joinTo.shape
       });
       const r = args[0](
         makeJoinQueryBuilder(
           j,
-          j.q.joinedShapes ? __spreadValues$c(__spreadValues$c({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
+          j.q.joinedShapes ? __spreadValues$d(__spreadValues$d({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
           joinTo
         )
       );
@@ -2621,16 +2627,16 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
         pushQueryArray(q, "or", query.or);
       }
       if (query.scopes) {
-        q.q.scopes = __spreadValues$c(__spreadValues$c({}, q.q.scopes), query.scopes);
+        q.q.scopes = __spreadValues$d(__spreadValues$d({}, q.q.scopes), query.scopes);
       }
     }
-    const joinedShapes = __spreadProps$4(__spreadValues$c({}, joinTo.q.joinedShapes), {
+    const joinedShapes = __spreadProps$4(__spreadValues$d({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
     const r = args0(
       makeJoinQueryBuilder(
         q,
-        q.q.joinedShapes ? __spreadValues$c(__spreadValues$c({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
+        q.q.joinedShapes ? __spreadValues$d(__spreadValues$d({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
         joinTo
       )
     );
@@ -2678,30 +2684,32 @@ const _queryNone = (q) => {
 };
 const isQueryNone = (q) => q.then === noneMethods.then;
 
-var __defProp$b = Object.defineProperty;
+var __defProp$c = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
-var __hasOwnProp$c = Object.prototype.hasOwnProperty;
-var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$b = (a, b) => {
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$c.call(b, prop))
-      __defNormalProp$b(a, prop, b[prop]);
-  if (__getOwnPropSymbols$c)
-    for (var prop of __getOwnPropSymbols$c(b)) {
-      if (__propIsEnum$c.call(b, prop))
-        __defNormalProp$b(a, prop, b[prop]);
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const _join = (query, require2, type, first, args) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   let joinKey;
   let shape;
   let parsers;
+  let batchParsers;
+  let computeds;
   let joinSubQuery = false;
   if (typeof first === "function") {
     first = first(query.relations);
@@ -2717,6 +2725,8 @@ const _join = (query, require2, type, first, args) => {
     if (joinKey) {
       shape = getShapeFromSelect(q, joinSubQuery);
       parsers = q.q.parsers;
+      batchParsers = q.q.batchParsers;
+      computeds = q.q.computeds;
       if (joinSubQuery) {
         first = q.clone();
         first.shape = shape;
@@ -2727,12 +2737,17 @@ const _join = (query, require2, type, first, args) => {
     const relation = query.relations[joinKey];
     if (relation) {
       shape = getShapeFromSelect(relation.relationConfig.query);
-      parsers = relation.relationConfig.query.q.parsers;
+      const r = relation.relationConfig.query;
+      parsers = r.q.parsers;
+      batchParsers = r.q.batchParsers;
+      computeds = r.q.computeds;
     } else {
-      shape = (_a = query.q.withShapes) == null ? void 0 : _a[joinKey];
+      const w = (_a = query.q.withShapes) == null ? void 0 : _a[joinKey];
+      shape = w == null ? void 0 : w.shape;
+      computeds = w == null ? void 0 : w.computeds;
       if (shape) {
         if (!require2)
-          shape = __spreadValues$b({}, shape);
+          shape = __spreadValues$c({}, shape);
         parsers = {};
         for (const key in shape) {
           const parser = shape[key].parseFn;
@@ -2743,20 +2758,6 @@ const _join = (query, require2, type, first, args) => {
       }
     }
   }
-  if (joinKey) {
-    setQueryObjectValue(
-      query,
-      "joinedShapes",
-      joinKey,
-      shape
-    );
-    setQueryObjectValue(
-      query,
-      "joinedParsers",
-      joinKey,
-      parsers
-    );
-  }
   const joinArgs = processJoinArgs(
     query,
     first,
@@ -2779,17 +2780,60 @@ const _join = (query, require2, type, first, args) => {
         joinKey,
         j.q.parsers
       );
+      if (j.q.batchParsers) {
+        ((_d = (_c = query.q).joinedBatchParsers) != null ? _d : _c.joinedBatchParsers = {})[joinKey] = j.q.batchParsers;
+      }
+      setQueryObjectValue(
+        query,
+        "joinedComputeds",
+        joinKey,
+        j.q.computeds
+      );
+    } else {
+      addAllShapesAndParsers(
+        query,
+        joinKey,
+        shape,
+        parsers,
+        batchParsers,
+        computeds
+      );
     }
   } else if (require2 && "r" in joinArgs && isQueryNone(joinArgs.r)) {
     return _queryNone(query);
+  } else {
+    addAllShapesAndParsers(
+      query,
+      joinKey,
+      shape,
+      parsers,
+      batchParsers,
+      computeds
+    );
   }
   return pushQueryValue(query, "join", {
     type,
     args: joinArgs
   });
 };
+const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, computeds) => {
+  var _a, _b;
+  if (!joinKey)
+    return;
+  setQueryObjectValue(query, "joinedShapes", joinKey, shape);
+  setQueryObjectValue(query, "joinedParsers", joinKey, parsers);
+  if (batchParsers) {
+    ((_b = (_a = query.q).joinedBatchParsers) != null ? _b : _a.joinedBatchParsers = {})[joinKey] = batchParsers;
+  }
+  setQueryObjectValue(
+    query,
+    "joinedComputeds",
+    joinKey,
+    computeds
+  );
+};
 const _joinLateral = (self, type, arg, cb, as) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   const q = self;
   let relation;
   if (typeof arg === "string") {
@@ -2797,13 +2841,14 @@ const _joinLateral = (self, type, arg, cb, as) => {
     if (relation) {
       arg = relation.relationConfig.query.clone();
     } else {
-      const shape = (_a = q.q.withShapes) == null ? void 0 : _a[arg];
-      if (shape) {
+      const w = (_a = q.q.withShapes) == null ? void 0 : _a[arg];
+      if (w) {
         const t = Object.create(q.queryBuilder);
         t.table = arg;
-        t.shape = shape;
-        t.q = __spreadProps$3(__spreadValues$b({}, t.q), {
-          shape
+        t.shape = w.shape;
+        t.computeds = w.computeds;
+        t.q = __spreadProps$3(__spreadValues$c({}, t.q), {
+          shape: w.shape
         });
         t.baseQuery = t;
         arg = t;
@@ -2812,7 +2857,8 @@ const _joinLateral = (self, type, arg, cb, as) => {
   }
   const query = arg;
   query.q.joinTo = q;
-  ((_c = (_b = query.q).joinedShapes) != null ? _c : _b.joinedShapes = {})[getQueryAs(q)] = q.q.shape;
+  const joinedAs = getQueryAs(q);
+  ((_c = (_b = query.q).joinedShapes) != null ? _c : _b.joinedShapes = {})[joinedAs] = q.q.shape;
   let result = resolveSubQueryCallback(query, cb);
   if (relation) {
     result = relation.relationConfig.joinQuery(
@@ -2825,12 +2871,13 @@ const _joinLateral = (self, type, arg, cb, as) => {
     const shape = getShapeFromSelect(result, true);
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
     setQueryObjectValue(q, "joinedParsers", joinKey, result.q.parsers);
+    if (result.q.batchParsers) {
+      ((_e = (_d = q.q).joinedBatchParsers) != null ? _e : _d.joinedBatchParsers = {})[joinKey] = result.q.batchParsers;
+    }
   }
-  return pushQueryValue(q, "join", [
-    type,
-    result,
-    as || getQueryAs(result)
-  ]);
+  as || (as = getQueryAs(result));
+  ((_g = (_f = q.q).joinedComputeds) != null ? _g : _f.joinedComputeds = {})[as] = result.q.computeds;
+  return pushQueryValue(q, "join", [type, result, as]);
 };
 
 class EnumColumn extends ColumnType {
@@ -3121,7 +3168,201 @@ class Transaction {
   }
 }
 
+const applyBatchTransforms = (query, batches) => {
+  if (query.transform) {
+    for (const item of batches) {
+      item.parent[item.key] = orchidCore.applyTransforms(
+        query.returnType,
+        query.transform,
+        item.data
+      );
+    }
+  }
+};
+const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key) => {
+  var _a;
+  if (renames) {
+    for (const { data } of batches) {
+      for (const record of data) {
+        if (record) {
+          for (const a in renames) {
+            record[a] = record[renames[a]];
+          }
+        }
+      }
+    }
+  }
+  if (tempColumns == null ? void 0 : tempColumns.size) {
+    for (const { data } of batches) {
+      for (const record of data) {
+        if (record) {
+          for (const key2 of tempColumns) {
+            delete record[key2];
+          }
+        }
+      }
+    }
+  }
+  if (returnType === "one" || returnType === "oneOrThrow") {
+    for (const batch of batches) {
+      batch.data = batch.data[0];
+    }
+  } else if (returnType === "pluck") {
+    for (const { data } of batches) {
+      for (let i = 0; i < data.length; i++) {
+        data[i] = data[i][key];
+      }
+    }
+  } else if (returnType === "value" || returnType === "valueOrThrow") {
+    for (const item of batches) {
+      item.parent[item.key] = (_a = item.data[0]) == null ? void 0 : _a[key];
+    }
+  }
+};
+
+class ComputedColumn {
+  constructor(kind, deps, fn) {
+    this.kind = kind;
+    this.deps = deps;
+    this.fn = fn;
+  }
+}
+const computeAtRuntime = (deps, fn) => new ComputedColumn("one", deps, fn);
+const computeBatchAtRuntime = (deps, fn) => new ComputedColumn("many", deps, fn);
+const applyComputedColumns = (q, fn) => {
+  var _a, _b;
+  q.computeAtRuntime = computeAtRuntime;
+  q.computeBatchAtRuntime = computeBatchAtRuntime;
+  const computed = fn(q);
+  for (const key in computed) {
+    const item = computed[key];
+    if (item instanceof ComputedColumn) {
+      ((_b = (_a = q.q).computeds) != null ? _b : _a.computeds = {})[key] = item;
+    } else {
+      (q.shape[key] = item.result.value || UnknownColumn.instance).data.computed = item;
+    }
+  }
+  q.computeAtRuntime = q.computeBatchAtRuntime = void 0;
+};
+const processComputedResult = (query, result) => {
+  let promises;
+  for (const key in query.selectedComputeds) {
+    const computed = query.selectedComputeds[key];
+    if (computed.kind === "one") {
+      for (const record of result) {
+        record[key] = computed.fn(record);
+      }
+    } else {
+      const res = computed.fn(result);
+      if (Array.isArray(res)) {
+        saveBatchComputed(key, result, res);
+      } else {
+        (promises != null ? promises : promises = []).push(
+          res.then(
+            (res2) => saveBatchComputed(key, result, res2)
+          )
+        );
+      }
+    }
+  }
+  if (!promises)
+    return;
+  return Promise.all(promises);
+};
+const processComputedBatches = (query, batches, originalReturnType, returnType, tempColumns, renames, key) => {
+  let promises;
+  for (const key2 in query.selectedComputeds) {
+    const computed = query.selectedComputeds[key2];
+    if (computed.kind === "one") {
+      for (const { data } of batches) {
+        for (const record of data) {
+          if (record) {
+            record[key2] = computed.fn(record);
+          }
+        }
+      }
+    } else {
+      for (const { data } of batches) {
+        let present;
+        let blanks;
+        if (!returnType || returnType === "all") {
+          present = data;
+        } else {
+          present = [];
+          blanks = /* @__PURE__ */ new Set();
+          for (let i = 0; i < data.length; i++) {
+            if (data[i]) {
+              present.push(data[i]);
+            } else {
+              blanks.add(i);
+            }
+          }
+        }
+        const res = computed.fn(present);
+        if (Array.isArray(res)) {
+          saveBatchComputed(key2, data, res, blanks);
+        } else {
+          (promises != null ? promises : promises = []).push(
+            res.then(
+              (res2) => saveBatchComputed(key2, data, res2, blanks)
+            )
+          );
+        }
+      }
+    }
+  }
+  if (!promises)
+    return;
+  return Promise.all(promises).then(() => {
+    finalizeNestedHookSelect(
+      batches,
+      originalReturnType,
+      tempColumns,
+      renames,
+      key
+    );
+    applyBatchTransforms(query, batches);
+  });
+};
+const saveBatchComputed = (key, result, res, blanks) => {
+  const len = result.length;
+  const actual = res.length + ((blanks == null ? void 0 : blanks.size) || 0);
+  if (len !== actual) {
+    throw new Error(
+      `Incorrect length of batch computed result for column ${key}. Expected ${len}, received ${actual}.`
+    );
+  }
+  if (blanks) {
+    for (let i = 0, r = 0; i < len; i++) {
+      if (!blanks.has(i)) {
+        result[i][key] = res[r++];
+      }
+    }
+  } else {
+    for (let i = 0; i < len; i++) {
+      result[i][key] = res[i];
+    }
+  }
+};
+
+var __defProp$b = Object.defineProperty;
+var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
+var __hasOwnProp$c = Object.prototype.hasOwnProperty;
+var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$b = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$c.call(b, prop))
+      __defNormalProp$b(a, prop, b[prop]);
+  if (__getOwnPropSymbols$c)
+    for (var prop of __getOwnPropSymbols$c(b)) {
+      if (__propIsEnum$c.call(b, prop))
+        __defNormalProp$b(a, prop, b[prop]);
+    }
+  return a;
+};
 const queryMethodByReturnType = {
+  undefined: "query",
   all: "query",
   rows: "arrays",
   pluck: "arrays",
@@ -3169,9 +3410,6 @@ Object.defineProperty(Then.prototype, "then", {
     });
   }
 });
-const handleResult = (q, returnType, result, isSubQuery) => {
-  return parseResult(q, q.q.parsers, returnType, result, isSubQuery);
-};
 function maybeWrappedThen(resolve, reject) {
   const { q } = this;
   let beforeHooks;
@@ -3229,7 +3467,7 @@ const callAfterHook = function(cb) {
 };
 const beginSql = { text: "BEGIN" };
 const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
-  var _a;
+  var _a, _b;
   const { q: query } = q;
   let sql;
   let logData;
@@ -3246,7 +3484,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     sql = q.toSQL();
     const { hookSelect } = sql;
     const { returnType = "all" } = query;
-    const returns = hookSelect ? "all" : returnType;
+    const tempReturnType = hookSelect || returnType === "rows" && q.q.batchParsers ? "all" : returnType;
     let result;
     let queryResult;
     if ("text" in sql) {
@@ -3256,7 +3494,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       if (query.log) {
         logData = query.log.beforeQuery(sql);
       }
-      queryResult = await adapter[hookSelect ? "query" : queryMethodByReturnType[returnType]](sql);
+      queryResult = await adapter[queryMethodByReturnType[tempReturnType]](sql);
       if (query.patchResult) {
         await query.patchResult(q, queryResult);
       }
@@ -3264,9 +3502,9 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         query.log.afterQuery(sql, logData);
         sql = void 0;
       }
-      result = query.handleResult(q, returns, queryResult);
+      result = query.handleResult(q, tempReturnType, queryResult);
     } else {
-      const queryMethod = hookSelect ? "query" : queryMethodByReturnType[returnType];
+      const queryMethod = queryMethodByReturnType[tempReturnType];
       if (!trx) {
         if (query.log)
           logData = query.log.beforeQuery(beginSql);
@@ -3301,9 +3539,37 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
       if (query.patchResult) {
         await query.patchResult(q, queryResult);
       }
-      result = query.handleResult(q, returns, queryResult);
+      result = query.handleResult(q, tempReturnType, queryResult);
     }
-    if (afterHooks || afterCommitHooks || query.after) {
+    if (result && typeof result === "object" && typeof result.then === "function") {
+      result = await result;
+    }
+    let tempColumns;
+    let renames;
+    if (hookSelect) {
+      for (const column of hookSelect.keys()) {
+        const as = hookSelect.get(column).as;
+        if (as)
+          (renames != null ? renames : renames = {})[column] = as;
+        (_a = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _a.add(as || column);
+      }
+      if (renames) {
+        for (const record of result) {
+          for (const a in renames) {
+            const value = record[renames[a]];
+            record[renames[a]] = record[a];
+            record[a] = value;
+          }
+        }
+      }
+      if (query.selectedComputeds) {
+        const promise = processComputedResult(query, result);
+        if (promise)
+          await promise;
+      }
+    }
+    const hasAfterHook = afterHooks || afterCommitHooks || query.after;
+    if (hasAfterHook) {
       if (queryResult.rowCount) {
         if (afterHooks || query.after) {
           const args = [result, q];
@@ -3315,7 +3581,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
           );
         }
         if (afterCommitHooks && trx) {
-          ((_a = trx.afterCommit) != null ? _a : trx.afterCommit = []).push(
+          ((_b = trx.afterCommit) != null ? _b : trx.afterCommit = []).push(
             result,
             q,
             afterCommitHooks
@@ -3328,8 +3594,24 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         const args = [result, q];
         await Promise.all(query.after.map(callAfterHook, args));
       }
-      if (hookSelect)
-        result = filterResult(q, returnType, queryResult, hookSelect, result);
+    }
+    if (hookSelect || tempReturnType !== returnType) {
+      if (renames) {
+        for (const record of result) {
+          for (const a in renames) {
+            record[a] = record[renames[a]];
+          }
+        }
+      }
+      result = filterResult(
+        q,
+        returnType,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        queryResult,
+        result,
+        tempColumns,
+        hasAfterHook
+      );
     }
     if (query.transform) {
       result = orchidCore.applyTransforms(returnType, query.transform, result);
@@ -3375,57 +3657,91 @@ const assignError = (to, from) => {
   to.routine = from.routine;
   return to;
 };
-const parseResult = (q, parsers, returnType = "all", result, isSubQuery) => {
+const handleResult = (q, returnType, result, isSubQuery) => {
   var _a, _b;
+  const { parsers } = q.q;
   switch (returnType) {
     case "all": {
       if (q.q.throwOnNotFound && result.rows.length === 0)
         throw new NotFoundError(q);
+      const promise = parseBatch(q, result);
       const { rows } = result;
       if (parsers) {
         for (const row of rows) {
           parseRecord(parsers, row);
         }
       }
-      return rows;
+      return promise ? promise.then(() => rows) : rows;
     }
     case "one": {
-      const row = result.rows[0];
-      if (!row)
+      const { rows } = result;
+      if (!rows.length)
         return;
-      return parsers ? parseRecord(parsers, row) : row;
+      const promise = parseBatch(q, result);
+      if (parsers)
+        parseRecord(parsers, rows[0]);
+      return promise ? promise.then(() => rows[0]) : rows[0];
     }
     case "oneOrThrow": {
-      const row = result.rows[0];
-      if (!row)
+      const { rows } = result;
+      if (!rows.length)
         throw new NotFoundError(q);
-      return parsers ? parseRecord(parsers, row) : row;
+      const promise = parseBatch(q, result);
+      if (parsers)
+        parseRecord(parsers, rows[0]);
+      return promise ? promise.then(() => rows[0]) : rows[0];
     }
     case "rows": {
-      return parsers ? parseRows(
-        parsers,
-        result.fields,
-        result.rows
-      ) : result.rows;
+      const { rows } = result;
+      const promise = parseBatch(q, result);
+      if (promise) {
+        return promise.then(() => {
+          if (parsers)
+            parseRows(parsers, result.fields, rows);
+          return rows;
+        });
+      } else if (parsers) {
+        parseRows(parsers, result.fields, rows);
+      }
+      return 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;
+      const { rows } = result;
+      const promise = parseBatch(q, result);
+      if (promise) {
+        return promise.then(() => {
+          parsePluck(parsers, isSubQuery, rows);
+          return rows;
+        });
       }
-      return result.rows.map((row) => row[0]);
+      parsePluck(parsers, isSubQuery, rows);
+      return rows;
     }
     case "value": {
-      const value = (_a = result.rows[0]) == null ? void 0 : _a[0];
-      return value !== void 0 ? parseValue(value, parsers) : q.q.notFoundDefault;
+      const { rows } = result;
+      const promise = parseBatch(q, result);
+      if (promise) {
+        return promise.then(() => {
+          var _a2;
+          return ((_a2 = rows[0]) == null ? void 0 : _a2[0]) !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
+        });
+      }
+      return ((_a = rows[0]) == null ? void 0 : _a[0]) !== void 0 ? parseValue(rows[0][0], parsers) : q.q.notFoundDefault;
     }
     case "valueOrThrow": {
-      const value = (_b = result.rows[0]) == null ? void 0 : _b[0];
-      if (value === void 0)
+      const { rows } = result;
+      const promise = parseBatch(q, result);
+      if (promise) {
+        return promise.then(() => {
+          var _a2;
+          if (((_a2 = rows[0]) == null ? void 0 : _a2[0]) === void 0)
+            throw new NotFoundError(q);
+          return parseValue(rows[0][0], parsers);
+        });
+      }
+      if (((_b = rows[0]) == null ? void 0 : _b[0]) === void 0)
         throw new NotFoundError(q);
-      return parseValue(value, parsers);
+      return parseValue(rows[0][0], parsers);
     }
     case "rowCount": {
       if (q.q.throwOnNotFound && result.rowCount === 0) {
@@ -3438,6 +3754,17 @@ const parseResult = (q, parsers, returnType = "all", result, isSubQuery) => {
     }
   }
 };
+const parseBatch = (q, queryResult) => {
+  let promises;
+  if (q.q.batchParsers) {
+    for (const parser of q.q.batchParsers) {
+      const res = parser.fn(parser.path, queryResult);
+      if (res)
+        (promises != null ? promises : promises = []).push(res);
+    }
+  }
+  return promises && Promise.all(promises);
+};
 const parseRecord = (parsers, row) => {
   for (const key in parsers) {
     if (key in row) {
@@ -3455,38 +3782,43 @@ const parseRows = (parsers, fields, rows) => {
       }
     }
   }
-  return rows;
+};
+const parsePluck = (parsers, isSubQuery, rows) => {
+  const pluck = parsers == null ? void 0 : parsers.pluck;
+  if (pluck) {
+    for (let i = 0; i < rows.length; i++) {
+      rows[i] = pluck(isSubQuery ? rows[i] : rows[i][0]);
+    }
+  } else if (!isSubQuery) {
+    for (let i = 0; i < rows.length; i++) {
+      rows[i] = rows[i][0];
+    }
+  }
 };
 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) => {
+const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterHook) => {
   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;
-    });
+    return filterAllResult(result, tempColumns, hasAfterHook);
   }
   if (returnType === "oneOrThrow" || returnType === "one") {
-    const row = result[0];
+    let row = result[0];
     if (!row) {
       if (returnType === "oneOrThrow")
         throw new NotFoundError(q);
       return void 0;
+    } else if (!(tempColumns == null ? void 0 : tempColumns.size)) {
+      return row;
     } else {
-      result = {};
-      for (const key in row) {
-        if (!hookSelect.includes(key)) {
-          result[key] = row[key];
-        }
+      if (hasAfterHook)
+        row = __spreadValues$b({}, row);
+      for (const column of tempColumns) {
+        delete row[column];
       }
-      return result;
+      return row;
     }
   }
   if (returnType === "value") {
@@ -3506,20 +3838,30 @@ const filterResult = (q, returnType, queryResult, hookSelect, result) => {
     return result.map((row) => row[key]);
   }
   if (returnType === "rows") {
-    const pick = getSelectPick(queryResult, hookSelect);
-    return result.map(
-      (full) => pick.map((key) => full[key])
-    );
+    result = filterAllResult(result, tempColumns, hasAfterHook);
+    return result.map((record) => Object.values(record));
   }
   return;
 };
-const getSelectPick = (queryResult, hookSelect) => {
-  const pick = [];
-  for (const field of queryResult.fields) {
-    if (!hookSelect.includes(field.name))
-      pick.push(field.name);
+const filterAllResult = (result, tempColumns, hasAfterHook) => {
+  if (tempColumns == null ? void 0 : tempColumns.size) {
+    if (hasAfterHook) {
+      return result.map((data) => {
+        const record = __spreadValues$b({}, data);
+        for (const key of tempColumns) {
+          delete record[key];
+        }
+        return record;
+      });
+    } else {
+      for (const record of result) {
+        for (const key of tempColumns) {
+          delete record[key];
+        }
+      }
+    }
   }
-  return pick;
+  return result;
 };
 
 const addParserForRawExpression = (q, key, raw) => {
@@ -3527,58 +3869,220 @@ const addParserForRawExpression = (q, key, raw) => {
   if (type == null ? void 0 : 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;
+  var _a, _b, _c, _d;
   const parsers = (_a = q.q.joinedParsers) == null ? void 0 : _a[arg];
   if (parsers) {
     orchidCore.setParserToQuery(q.q, as, (row) => parseRecord(parsers, row));
   }
+  const batchParsers = (_b = q.q.joinedBatchParsers) == null ? void 0 : _b[arg];
+  if (batchParsers) {
+    ((_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = []).push(
+      ...batchParsers.map((x) => ({
+        path: [as, ...x.path],
+        fn: x.fn
+      }))
+    );
+  }
 };
 const addParserForSelectItem = (q, as, key, arg) => {
+  var _a, _b, _c, _d;
   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;
-          const result = query.handleResult(arg, t, subQueryResult, true);
-          return query.transform ? orchidCore.applyTransforms(t, query.transform, result) : result;
-        });
+      if (query.batchParsers) {
+        const batchParsers = (_b = (_a = q.q).batchParsers) != null ? _b : _a.batchParsers = [];
+        for (const bp of query.batchParsers) {
+          batchParsers.push({ path: [key, ...bp.path], fn: bp.fn });
+        }
       }
-      if (query.returnType === "valueOrThrow" || query.returnType === "oneOrThrow") {
-        pushQueryValue(
-          q,
-          "transform",
-          (data) => {
-            if (Array.isArray(data)) {
-              for (const item of data) {
-                if (item[key] === void 0) {
-                  throw new NotFoundError(q);
+      if (query.hookSelect || query.parsers || query.transform) {
+        const batchParsers = (_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = [];
+        batchParsers.push({
+          path: [key],
+          fn: (path, queryResult) => {
+            var _a2, _b2, _c2;
+            const { rows } = queryResult;
+            const originalReturnType = query.returnType || "all";
+            let returnType = originalReturnType;
+            const { hookSelect } = query;
+            const batches = [];
+            let last = path.length;
+            if (returnType === "value" || returnType === "valueOrThrow") {
+              if (hookSelect) {
+                batches.push = (item) => {
+                  if (!(key in item)) {
+                    returnType = returnType === "value" ? "one" : "oneOrThrow";
+                  }
+                  batches.push = Array.prototype.push;
+                  return batches.push(item);
+                };
+              } else {
+                last--;
+              }
+            }
+            collectNestedSelectBatches(batches, rows, path, last);
+            switch (returnType) {
+              case "all": {
+                const { parsers } = query;
+                if (parsers) {
+                  for (const { data } of batches) {
+                    for (const one of data) {
+                      parseRecord(parsers, one);
+                    }
+                  }
                 }
+                break;
               }
-            } else {
-              if (data[key] === void 0) {
-                throw new NotFoundError(q);
+              case "one":
+              case "oneOrThrow": {
+                const { parsers } = query;
+                if (parsers) {
+                  if (returnType === "one") {
+                    for (const { data } of batches) {
+                      if (data)
+                        parseRecord(parsers, data);
+                    }
+                  } else {
+                    for (const { data } of batches) {
+                      if (!data)
+                        throw new NotFoundError(arg);
+                      parseRecord(parsers, data);
+                    }
+                  }
+                } else if (returnType !== "one") {
+                  for (const { data } of batches) {
+                    if (!data)
+                      throw new NotFoundError(arg);
+                  }
+                }
+                if (hookSelect) {
+                  for (const batch of batches) {
+                    batch.data = [batch.data];
+                  }
+                }
+                break;
+              }
+              case "pluck": {
+                const parse = (_a2 = query.parsers) == null ? void 0 : _a2.pluck;
+                if (parse) {
+                  for (const { data } of batches) {
+                    for (let i = 0; i < data.length; i++) {
+                      data[i] = parse(data[i]);
+                    }
+                  }
+                }
+                break;
+              }
+              case "value":
+              case "valueOrThrow": {
+                const parse = (_b2 = query.parsers) == null ? void 0 : _b2[orchidCore.getValueKey];
+                if (parse) {
+                  if (returnType === "value") {
+                    for (const { data } of batches) {
+                      data[key] = data[key] === void 0 ? arg.q.notFoundDefault : parse(data[key]);
+                    }
+                  } else {
+                    for (const { data } of batches) {
+                      if (data[key] === void 0)
+                        throw new NotFoundError(arg);
+                      data[key] = parse(data[key]);
+                    }
+                  }
+                } else if (returnType !== "value") {
+                  for (const { data } of batches) {
+                    if (data[key] === void 0)
+                      throw new NotFoundError(arg);
+                  }
+                }
+                if (hookSelect) {
+                  for (const batch of batches) {
+                    batch.data = [batch.data];
+                  }
+                }
+                break;
               }
             }
-            return data;
+            if (hookSelect) {
+              let tempColumns;
+              let renames;
+              for (const column of hookSelect.keys()) {
+                const as2 = hookSelect.get(column).as;
+                if (as2)
+                  (renames != null ? renames : renames = {})[column] = as2;
+                (_c2 = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _c2.add(as2 || column);
+              }
+              if (renames) {
+                for (const { data } of batches) {
+                  for (const record of data) {
+                    if (record) {
+                      for (const a in renames) {
+                        const value = record[renames[a]];
+                        record[renames[a]] = record[a];
+                        record[a] = value;
+                      }
+                    }
+                  }
+                }
+              }
+              if (query.selectedComputeds) {
+                const maybePromise = processComputedBatches(
+                  query,
+                  batches,
+                  originalReturnType,
+                  returnType,
+                  tempColumns,
+                  renames,
+                  key
+                );
+                if (maybePromise)
+                  return maybePromise;
+              }
+              finalizeNestedHookSelect(
+                batches,
+                originalReturnType,
+                tempColumns,
+                renames,
+                key
+              );
+            }
+            applyBatchTransforms(query, batches);
+            return;
           }
-        );
+        });
       }
     }
     return arg;
   }
   return setParserForSelectedString(q, arg, as, key);
 };
+const collectNestedSelectBatches = (batches, rows, path, last) => {
+  const stack = rows.map(
+    (row) => ({
+      data: row,
+      i: 0
+    })
+  );
+  while (stack.length > 0) {
+    const item = stack.pop();
+    const { i } = item;
+    if (i === last) {
+      batches.push(item);
+      continue;
+    }
+    const { data } = item;
+    const key = path[i];
+    if (Array.isArray(data)) {
+      for (let key2 = 0; key2 < data.length; key2++) {
+        stack.push({ data: data[key2], parent: data, key: key2, i });
+      }
+    } else if (data && typeof data === "object") {
+      stack.push({ data: data[key], parent: data, key, i: i + 1 });
+    }
+  }
+};
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
   var _a, _b, _c, _d;
@@ -3592,7 +4096,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
       value = resolveSubQueryCallback(q, value);
       if (isQueryNone(value)) {
         if (value.q.innerJoinLateral) {
-          return;
+          return false;
         }
       } else if (!orchidCore.isExpression(value) && value.joinQuery) {
         value = value.joinQuery(value, q);
@@ -3602,17 +4106,23 @@ const processSelectArg = (q, as, arg, columnAs) => {
           query = value.json(false);
           value.q.coalesceValue = emptyArrSQL;
         } else if (returnType === "pluck") {
-          query = value.wrap(value.baseQuery.clone()).jsonAgg(value.q.select[0]);
+          query = value.q.select ? value.wrap(value.baseQuery.clone()).jsonAgg(value.q.select[0]) : value.json(false);
           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] }
-              };
+          if (returnType === "value" || returnType === "valueOrThrow") {
+            if (value.q.select) {
+              if (typeof value.q.select[0] === "string") {
+                value.q.select[0] = {
+                  selectAs: { r: value.q.select[0] }
+                };
+              }
+              query = value;
+            } else {
+              query = value.json(false);
             }
+          } else {
+            query = value;
           }
-          query = value;
         }
         let asOverride = key;
         if ((_a = value.q.joinedShapes) == null ? void 0 : _a[key]) {
@@ -3646,7 +4156,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
   return { selectAs };
 };
 const setParserForSelectedString = (q, arg, as, columnAs) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const index = arg.indexOf(".");
   if (index !== -1) {
     const table = arg.slice(0, index);
@@ -3654,26 +4164,59 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
     if (column === "*") {
       addParsersForSelectJoined(q, table, columnAs);
       return table === as ? column : arg;
-    } else {
-      if (table === as) {
+    } else if (table === as) {
+      if (columnAs) {
         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;
+          q.q.parsers[columnAs] = parser;
       }
+      return handleComputed(q, q.q.computeds, 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);
+      const batchParsers = (_d = q.q.joinedBatchParsers) == null ? void 0 : _d[table];
+      if (batchParsers) {
+        for (const bp of batchParsers) {
+          if (bp.path[0] === column) {
+            ((_f = (_e = q.q).batchParsers) != null ? _f : _e.batchParsers = []).push(bp);
+          }
+        }
+      }
+      const computeds = (_g = q.q.joinedComputeds) == null ? void 0 : _g[table];
+      if (computeds == null ? void 0 : computeds[column]) {
+        const computed = computeds[column];
+        const map = (_i = (_h = q.q).hookSelect) != null ? _i : _h.hookSelect = /* @__PURE__ */ new Map();
+        for (const column2 of computed.deps) {
+          map.set(column2, { select: `${table}.${column2}` });
+        }
+        ((_k = (_j = q.q).selectedComputeds) != null ? _k : _j.selectedComputeds = {})[column] = computed;
+        return;
+      }
+      return arg;
     }
   } else {
-    const parser = (_d = q.q.parsers) == null ? void 0 : _d[arg];
-    if (parser)
-      orchidCore.setParserToQuery(q.q, columnAs || arg, parser);
-    return arg;
+    if (columnAs) {
+      const parser = (_l = q.q.parsers) == null ? void 0 : _l[arg];
+      if (parser)
+        q.q.parsers[columnAs] = parser;
+    }
+    return handleComputed(q, q.q.computeds, arg);
   }
 };
+const handleComputed = (q, computeds, column) => {
+  var _a, _b, _c, _d;
+  if (computeds == null ? void 0 : computeds[column]) {
+    const computed = computeds[column];
+    const map = (_b = (_a = q.q).hookSelect) != null ? _b : _a.hookSelect = /* @__PURE__ */ new Map();
+    for (const column2 of computed.deps) {
+      map.set(column2, { select: column2 });
+    }
+    ((_d = (_c = q.q).selectedComputeds) != null ? _d : _c.selectedComputeds = {})[column] = computed;
+    return;
+  }
+  return column;
+};
 const getShapeFromSelect = (q, isSubQuery) => {
   const query = q.q;
   const { select, shape } = query;
@@ -3693,7 +4236,9 @@ const getShapeFromSelect = (q, isSubQuery) => {
     for (const item of select) {
       if (typeof item === "string") {
         addColumnToShapeFromSelect(q, item, shape, query, result, isSubQuery);
-      } else if ("selectAs" in item) {
+      } else if (orchidCore.isExpression(item)) {
+        result.value = item.result.value;
+      } else if (item && "selectAs" in item) {
         for (const key in item.selectAs) {
           const it = item.selectAs[key];
           if (typeof it === "string") {
@@ -3708,7 +4253,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
             );
           } else if (orchidCore.isExpression(it)) {
             result[key] = it.result.value;
-          } else {
+          } else if (it) {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
               const type = it.q[orchidCore.getValueKey];
@@ -3719,8 +4264,6 @@ const getShapeFromSelect = (q, isSubQuery) => {
             }
           }
         }
-      } else if (orchidCore.isExpression(item)) {
-        result.value = item.result.value;
       }
     }
   }
@@ -3756,12 +4299,13 @@ function _querySelect(q, args) {
     return q;
   }
   const as = q.q.as || q.table;
-  const selectArgs = new Array(len);
-  for (let i = 0; i < len; i++) {
-    selectArgs[i] = processSelectArg(q, as, args[i]);
-    if (!selectArgs[i]) {
+  const selectArgs = [];
+  for (const arg of args) {
+    const item = processSelectArg(q, as, arg);
+    if (item)
+      selectArgs.push(item);
+    else if (item === false)
       return _queryNone(q);
-    }
   }
   return pushQueryArray(q, "select", selectArgs);
 }
@@ -3831,20 +4375,25 @@ const _get = (query, returnType, arg) => {
       }
     }
     q[orchidCore.getValueKey] = type;
-    setParserForSelectedString(
+    const selected = setParserForSelectedString(
       query,
       arg,
       getQueryAs(query),
       orchidCore.getValueKey
     );
-    q.expr = new SelectItemExpression(query, arg, type);
+    q.select = selected ? [
+      q.expr = new SelectItemExpression(
+        query,
+        selected,
+        type
+      )
+    ] : void 0;
   } else {
     type = arg.result.value;
     q[orchidCore.getValueKey] = type;
     addParserForRawExpression(query, orchidCore.getValueKey, arg);
-    q.expr = arg;
+    q.select = [q.expr = arg];
   }
-  q.select = [q.expr];
   return setQueryOperators(
     query,
     (type == null ? void 0 : type.operators) || Operators.any
@@ -3880,23 +4429,27 @@ class AsMethods {
 }
 
 function queryFrom(self, arg) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const data = self.q;
   if (typeof arg === "string") {
     data.as || (data.as = arg);
-    data.shape = (_a = data.withShapes) == null ? void 0 : _a[arg];
+    const w = (_a = data.withShapes) == null ? void 0 : _a[arg];
+    data.shape = (_b = w == null ? void 0 : w.shape) != null ? _b : orchidCore.emptyObject;
+    data.computeds = w == null ? void 0 : w.computeds;
   } else if (orchidCore.isExpression(arg)) {
     data.as || (data.as = "t");
   } else if (Array.isArray(arg)) {
     const { shape } = data;
-    const parsers = (_b = data.parsers) != null ? _b : data.parsers = {};
+    const parsers = (_c = data.parsers) != null ? _c : data.parsers = {};
+    const computeds = (_d = data.computeds) != null ? _d : data.computeds = {};
     for (const item of arg) {
       if (typeof item === "string") {
-        const withShape = data.withShapes[item];
-        Object.assign(shape, withShape);
-        for (const key in withShape) {
-          if (withShape[key].parseFn) {
-            parsers[key] = withShape[key].parseFn;
+        const w = data.withShapes[item];
+        Object.assign(shape, w.shape);
+        Object.assign(computeds, w.computeds);
+        for (const key in w.shape) {
+          if (w.shape[key].parseFn) {
+            parsers[key] = w.shape[key].parseFn;
           }
         }
       } else if (!orchidCore.isExpression(item)) {
@@ -3909,6 +4462,7 @@ function queryFrom(self, arg) {
     data.as || (data.as = q.q.as || q.table || "t");
     data.shape = getShapeFromSelect(arg, true);
     data.parsers = q.q.parsers;
+    data.batchParsers = q.q.batchParsers;
   }
   data.from = arg;
   return self;
@@ -4018,44 +4572,117 @@ function queryJson(self, coalesce) {
 const pushSelectSql = (ctx, table, query, quotedAs) => {
   ctx.sql.push(selectToSql(ctx, table, query, quotedAs));
 };
-const selectToSql = (ctx, table, query, quotedAs) => {
+const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect) => {
+  var _a, _b;
+  let selected;
+  const list = [];
   if (query.select) {
-    const list = [];
     for (const item of query.select) {
       if (typeof item === "string") {
-        list.push(selectedStringToSQL(ctx, table, query, quotedAs, item));
-      } else if ("selectAs" in item) {
-        const obj = item.selectAs;
-        for (const as in obj) {
-          const value = obj[as];
-          if (typeof value === "object" || typeof value === "function") {
-            if (orchidCore.isExpression(value)) {
-              list.push(`${value.toSQL(ctx, quotedAs)} "${as}"`);
-            } else {
-              pushSubQuerySql(ctx, value, as, list, quotedAs);
+        let sql;
+        if (item === "*") {
+          if (hookSelect) {
+            selected != null ? selected : selected = {};
+            for (const key in table.internal.columnsKeysForSelectAll || query.shape) {
+              selected[key] = quotedAs;
             }
-          } else {
-            list.push(
-              `${columnToSql(
-                ctx,
-                table.q,
-                table.q.shape,
-                value,
-                quotedAs,
-                true
-              )} "${as}"`
+          }
+          sql = selectAllSql(table, query, quotedAs);
+        } else {
+          const index = item.indexOf(".");
+          if (index !== -1) {
+            const tableName = item.slice(0, index);
+            const key = item.slice(index + 1);
+            if (hookSelect == null ? void 0 : hookSelect.get(key))
+              (selected != null ? selected : selected = {})[key] = `"${tableName}"`;
+            sql = tableColumnToSqlWithAs(
+              ctx,
+              table.q,
+              item,
+              tableName,
+              key,
+              quotedAs,
+              true
             );
+          } else {
+            if (hookSelect == null ? void 0 : hookSelect.get(item))
+              (selected != null ? selected : selected = {})[item] = quotedAs;
+            sql = ownColumnToSqlWithAs(ctx, table.q, item, quotedAs, true);
+          }
+        }
+        list.push(sql);
+      } else if (item) {
+        if ("selectAs" in item) {
+          const obj = item.selectAs;
+          for (const as in obj) {
+            if (hookSelect)
+              (selected != null ? selected : selected = {})[as] = true;
+            const value = obj[as];
+            if (typeof value === "object") {
+              if (orchidCore.isExpression(value)) {
+                list.push(`${value.toSQL(ctx, quotedAs)} "${as}"`);
+              } else {
+                pushSubQuerySql(ctx, value, as, list, quotedAs);
+              }
+            } else if (value) {
+              list.push(
+                `${columnToSql(
+                  ctx,
+                  table.q,
+                  table.q.shape,
+                  value,
+                  quotedAs,
+                  true
+                )} "${as}"`
+              );
+            }
           }
+        } else {
+          list.push(selectedObjectToSQL(ctx, quotedAs, item));
         }
+      }
+    }
+  }
+  if (hookSelect) {
+    for (const column of hookSelect.keys()) {
+      const item = hookSelect.get(column);
+      const { select } = item;
+      let sql;
+      let quotedTable;
+      let columnName;
+      let col;
+      const index = select.indexOf(".");
+      if (index !== -1) {
+        const tableName = select.slice(0, index);
+        quotedTable = `"${tableName}"`;
+        columnName = select.slice(index + 1);
+        col = (_b = (_a = table.q.joinedShapes) == null ? void 0 : _a[tableName]) == null ? void 0 : _b[columnName];
+        sql = (col == null ? void 0 : col.data.computed) ? col.data.computed.toSQL(ctx, `"${tableName}"`) : `"${tableName}"."${(col == null ? void 0 : col.data.name) || columnName}"`;
       } else {
-        list.push(selectedObjectToSQL(ctx, quotedAs, item));
+        quotedTable = quotedAs;
+        columnName = select;
+        col = query.shape[select];
+        sql = simpleColumnToSQL(ctx, select, col, quotedAs);
       }
+      if (selected == null ? void 0 : selected[columnName]) {
+        if ((selected == null ? void 0 : selected[columnName]) === quotedTable) {
+          hookSelect.delete(column);
+          continue;
+        }
+        let i = 2;
+        let name;
+        while (selected[name = `${column}${i}`])
+          i++;
+        item.as = name;
+        sql += ` "${name}"`;
+      } else if (col == null ? void 0 : col.data.name) {
+        sql += ` "${columnName}"`;
+      }
+      list.push(sql);
     }
-    return list.join(", ");
   }
-  return selectAllSql(table, query, quotedAs);
+  return list.length ? list.join(", ") : selectAllSql(table, query, quotedAs);
 };
-const selectedStringToSQL = (ctx, table, query, quotedAs, item) => item === "*" ? selectAllSql(table, query, quotedAs) : columnToSqlWithAs(ctx, table.q, item, quotedAs, true);
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
@@ -4065,7 +4692,7 @@ const selectAllSql = (table, query, quotedAs) => {
   return ((_a = query.join) == null ? void 0 : _a.length) ? ((_b = table.internal.columnsForSelectAll) == null ? void 0 : _b.map((item) => `${quotedAs}.${item}`).join(", ")) || `${quotedAs}.*` : ((_c = table.internal.columnsForSelectAll) == null ? void 0 : _c.join(", ")) || "*";
 };
 const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
-  var _a;
+  var _a, _b, _c;
   const { returnType = "all" } = query.q;
   if (isQueryNone(query)) {
     let sql;
@@ -4129,20 +4756,27 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
     case "pluck": {
       const { select } = query.q;
       const first = select == null ? void 0 : select[0];
-      if (!select || !first) {
+      if (!first && ((_b = query.q.computeds) == null ? void 0 : _b[as])) {
+        query = queryJson(query);
+      } else if (!first) {
         throw new OrchidOrmInternalError(
           query,
           `Nothing was selected for pluck`
         );
+      } else {
+        const cloned = query.clone();
+        cloned.q.select = [{ selectAs: { c: first } }];
+        query = queryWrap(cloned, cloned.baseQuery.clone());
+        _queryGetOptional(query, new RawSQL(`COALESCE(json_agg("c"), '[]')`));
       }
-      const cloned = query.clone();
-      cloned.q.select = [{ selectAs: { c: first } }];
-      query = queryWrap(cloned, cloned.baseQuery.clone());
-      _queryGetOptional(query, new RawSQL(`COALESCE(json_agg("c"), '[]')`));
       break;
     }
     case "value":
     case "valueOrThrow":
+      if ((_c = query.q.computeds) == null ? void 0 : _c[as]) {
+        query = queryJson(query);
+      }
+      break;
     case "rows":
     case "rowCount":
     case "void":
@@ -4644,42 +5278,22 @@ const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs) =
 };
 const pushReturningSql = (ctx, q, data, quotedAs, hookSelect, keyword = "RETURNING") => {
   const { select } = data;
-  if (!(hookSelect == null ? void 0 : hookSelect.length) && !select)
-    return hookSelect;
-  let selected;
-  let hookFiltered;
-  if (select) {
-    selected = selectToSql(ctx, q, data, quotedAs);
+  if (!(hookSelect == null ? void 0 : hookSelect.size) && !select)
+    return hookSelect && /* @__PURE__ */ new Map();
+  ctx.sql.push(keyword);
+  if (q.q.hookSelect || hookSelect) {
+    const tempSelect = new Map(q.q.hookSelect);
     if (hookSelect) {
-      if (select.includes("*")) {
-        hookFiltered = orchidCore.emptyArray;
-      } else {
-        hookFiltered = [];
-        for (const column of hookSelect) {
-          if (!hookFiltered.includes(column) && !(select == null ? void 0 : select.includes(column)) && !(select == null ? void 0 : select.includes(`${quotedAs}.${column}`))) {
-            hookFiltered.push(column);
-          }
-        }
+      for (const column of hookSelect) {
+        tempSelect.set(column, { select: column });
       }
     }
-  } else {
-    hookFiltered = [];
-    for (const column of hookSelect) {
-      if (!hookFiltered.includes(column))
-        hookFiltered.push(column);
-    }
+    ctx.sql.push(selectToSql(ctx, q, data, quotedAs, tempSelect));
+    return tempSelect;
+  } else if (select) {
+    ctx.sql.push(selectToSql(ctx, q, data, quotedAs));
   }
-  ctx.sql.push(keyword);
-  if (hookFiltered == null ? void 0 : hookFiltered.length) {
-    if (selected)
-      ctx.sql.push(`${selected},`);
-    ctx.sql.push(
-      hookFiltered.map((column) => ownColumnToSql(data, column, quotedAs)).join(", ")
-    );
-  } else {
-    ctx.sql.push(selected);
-  }
-  return hookFiltered;
+  return;
 };
 
 const pushUpdateSql = (ctx, table, query, quotedAs) => {
@@ -5045,7 +5659,7 @@ const makeSQL = (table, options) => {
     if (query.for.mode)
       sql.push(query.for.mode);
   }
-  return { text: sql.join(" "), values };
+  return { text: sql.join(" "), values, hookSelect: query.hookSelect };
 };
 function pushLimitSQL(sql, values, q) {
   if (!q.returnsOne) {
@@ -5078,6 +5692,8 @@ const cloneQuery = (q) => {
     q.with = q.with.slice(0);
   if (q.select)
     q.select = q.select.slice(0);
+  if (q.hookSelect)
+    q.hookSelect = new Map(q.hookSelect);
   if (q.and)
     q.and = q.and.slice(0);
   if (q.or)
@@ -5090,6 +5706,8 @@ const cloneQuery = (q) => {
     q.joinedShapes = __spreadValues$a({}, q.joinedShapes);
   if (q.scopes)
     q.scopes = __spreadValues$a({}, q.scopes);
+  if (q.parsers)
+    q.parsers = __spreadValues$a({}, q.parsers);
   if (q.updateData) {
     q.updateData = q.updateData.slice(
       0
@@ -5122,7 +5740,7 @@ const cloneQuery = (q) => {
     if (q.afterCreate) {
       q.afterCreate = q.afterCreate.slice(0);
       if (q.afterCreateSelect) {
-        q.afterCreateSelect = q.afterCreateSelect.slice(0);
+        q.afterCreateSelect = new Set(q.afterCreateSelect);
       }
     }
   } else if (q.type === "update") {
@@ -5131,7 +5749,7 @@ const cloneQuery = (q) => {
     if (q.afterUpdate) {
       q.afterUpdate = q.afterUpdate.slice(0);
       if (q.afterUpdateSelect) {
-        q.afterUpdateSelect = q.afterUpdateSelect.slice(0);
+        q.afterUpdateSelect = new Set(q.afterUpdateSelect);
       }
     }
   } else if (q.type === "delete") {
@@ -5140,7 +5758,7 @@ const cloneQuery = (q) => {
     if (q.afterDelete) {
       q.afterDelete = q.afterDelete.slice(0);
       if (q.afterDeleteSelect) {
-        q.afterDeleteSelect = q.afterDeleteSelect.slice(0);
+        q.afterDeleteSelect = new Set(q.afterDeleteSelect);
       }
     }
   }
@@ -5165,8 +5783,6 @@ var __spreadValues$9 = (a, b) => {
 const getClonedQueryData = (query) => {
   const cloned = __spreadValues$9({}, query);
   delete cloned[toSQLCacheKey];
-  if (cloned.parsers)
-    cloned.parsers = __spreadValues$9({}, cloned.parsers);
   cloneQuery(cloned);
   return cloned;
 };
@@ -5371,12 +5987,14 @@ class VirtualColumn extends ColumnType {
   }
 }
 
-class UnknownColumn extends VirtualColumn {
+const _UnknownColumn = class extends VirtualColumn {
   constructor(schema) {
     super(schema, schema.unknown());
   }
-}
-RawSQL.prototype.result = { value: new UnknownColumn(defaultSchemaConfig) };
+};
+let UnknownColumn = _UnknownColumn;
+UnknownColumn.instance = new _UnknownColumn(defaultSchemaConfig);
+RawSQL.prototype.result = { value: UnknownColumn.instance };
 
 const makeColumnsByType = (schema) => {
   const t = makeColumnTypes(schema);
@@ -6425,7 +7043,7 @@ const insert = (self, {
   q.values = values;
   if (!q.kind)
     q.kind = kind;
-  const { select, returnType = "all" } = q;
+  const { select, returnType } = q;
   if (!select) {
     if (returnType !== "void")
       q.returnType = "rowCount";
@@ -6435,7 +7053,7 @@ const insert = (self, {
     } else if (returnType === "value" || returnType === "valueOrThrow") {
       q.returnType = "pluck";
     }
-  } else if (returnType === "all") {
+  } else if (!returnType || returnType === "all") {
     q.returnType = "from" in values ? values.from.q.returnType : "one";
   } else if (returnType === "pluck") {
     q.returnType = "valueOrThrow";
@@ -6454,7 +7072,7 @@ const getFromSelectColumns = (from, obj, many) => {
     if (typeof item === "string") {
       const index = item.indexOf(".");
       queryColumns.push(index === -1 ? item : item.slice(index + 1));
-    } else if ("selectAs" in item) {
+    } else if (item && "selectAs" in item) {
       queryColumns.push(...Object.keys(item.selectAs));
     }
   });
@@ -6498,12 +7116,7 @@ const _queryCreateMany = (q, data) => {
 };
 const _queryInsertMany = (q, data) => {
   const ctx = createCtx();
-  let result = insert(
-    q,
-    handleManyData(q, data, ctx),
-    "object",
-    true
-  );
+  let result = insert(q, handleManyData(q, data, ctx), "object", true);
   if (!data.length)
     result = result.none();
   return result;
@@ -7316,11 +7929,15 @@ class Having {
 }
 
 const before = (q, key, cb) => pushQueryValue(q, `before${key}`, cb);
-const after = (q, key, select, cb, commit) => pushQueryArray(
-  pushQueryValue(q, `after${key}${commit ? "Commit" : ""}`, cb),
-  `after${key}Select`,
-  select
-);
+const after = (q, key, select, cb, commit) => {
+  var _a, _b, _c;
+  pushQueryValue(q, `after${key}${commit ? "Commit" : ""}`, cb);
+  const set = (_c = (_a = q.q)[_b = `after${key}Select`]) != null ? _c : _a[_b] = /* @__PURE__ */ new Set();
+  for (const column of select) {
+    set.add(column);
+  }
+  return q;
+};
 const _queryHookBeforeQuery = (q, cb) => {
   return pushQueryValue(q, "before", cb);
 };
@@ -8381,7 +8998,9 @@ const mergableObjects = {
   parsers: true,
   defaults: true,
   joinedShapes: true,
-  joinedParsers: true
+  joinedParsers: true,
+  joinedBatchParsers: true,
+  selectedComputeds: true
 };
 class MergeQueryMethods {
   merge(q) {
@@ -8406,6 +9025,8 @@ class MergeQueryMethods {
               b: a[key].b,
               u: [...a[key].u, ...value.u]
             } : value;
+          } else if (value instanceof Set) {
+            a[key] = a[key] ? /* @__PURE__ */ new Set([...a[key], ...value]) : value;
           } else {
             a[key] = value;
           }
@@ -8600,7 +9221,10 @@ class WithMethods {
     }
     pushQueryValue(q, "with", { n: name, o: options, q: query });
     const shape = getShapeFromSelect(query, true);
-    return setQueryObjectValue(q, "withShapes", name, shape);
+    return setQueryObjectValue(q, "withShapes", name, {
+      shape,
+      computeds: query.q.computeds
+    });
   }
   withRecursive(name, ...args) {
     var _a, _b, _c;
@@ -8609,10 +9233,9 @@ class WithMethods {
     const arg = q.queryBuilder.clone();
     arg.q.withShapes = q.q.withShapes;
     let query = typeof baseFn === "function" ? baseFn(arg) : baseFn;
-    const shape = ((_b = (_a = arg.q).withShapes) != null ? _b : _a.withShapes = {})[name] = getShapeFromSelect(
-      query,
-      true
-    );
+    const shape = getShapeFromSelect(query, true);
+    const withConfig = { shape, computeds: query.q.computeds };
+    ((_b = (_a = arg.q).withShapes) != null ? _b : _a.withShapes = {})[name] = withConfig;
     const recursive = recursiveFn(arg);
     query = _queryUnion(query, [recursive], (_c = options.union) != null ? _c : "UNION ALL");
     options.recursive = true;
@@ -8622,7 +9245,7 @@ class WithMethods {
       });
     }
     pushQueryValue(q, "with", { n: name, o: options, q: query });
-    return setQueryObjectValue(q, "withShapes", name, shape);
+    return setQueryObjectValue(q, "withShapes", name, withConfig);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   withSql(name, ...args) {
@@ -8633,12 +9256,9 @@ class WithMethods {
       o: options,
       s: sql(q)
     });
-    return setQueryObjectValue(
-      q,
-      "withShapes",
-      name,
-      shape(this.columnTypes)
-    );
+    return setQueryObjectValue(q, "withShapes", name, {
+      shape: shape(this.columnTypes)
+    });
   }
 }
 
@@ -10156,12 +10776,9 @@ function orCreate(q, data, updateData, mergeData) {
       if (mergeData)
         data = __spreadValues$1(__spreadValues$1({}, mergeData), data);
       const inner = q2.create(data);
-      const { handleResult: handleResult2 } = inner.q;
       inner.q.handleResult = (q3, t, r, s) => {
-        queryResult = r;
-        const res = handleResult2(q3, t, r, s);
-        result = res;
-        return res;
+        result = handleResult(q3, t, r, s);
+        return inner.q.hookSelect ? result.map((row) => __spreadValues$1({}, row)) : result;
       };
       await inner;
       created = true;
@@ -10809,8 +11426,13 @@ class QueryMethods {
   pluck(select) {
     const q = this.clone();
     q.q.returnType = "pluck";
-    q.q.select = [select];
-    addParserForSelectItem(q, q.q.as || q.table, "pluck", select);
+    const selected = addParserForSelectItem(
+      q,
+      q.q.as || q.table,
+      "pluck",
+      select
+    );
+    q.q.select = selected ? [selected] : void 0;
     return q;
   }
   /**
@@ -11562,6 +12184,7 @@ class Db {
       tableData
     };
     this.baseQuery = this;
+    this.relations = {};
     const logger = options.logger || console;
     const parsers = {};
     let hasParsers = false;
@@ -11612,6 +12235,7 @@ class Db {
         );
       }
       this.internal.columnsForSelectAll = list;
+      this.internal.columnsKeysForSelectAll = __spreadValues({}, shape);
     }
     this.q = {
       adapter,
@@ -11650,6 +12274,8 @@ class Db {
     this.defaultSelectColumns = columns.filter(
       (column) => !shape[column].data.isHidden
     );
+    if (options.computed)
+      applyComputedColumns(this, options.computed);
     const defaultSelect = this.defaultSelectColumns.length === columns.length ? void 0 : this.defaultSelectColumns;
     this.toSQL = defaultSelect ? function(options2) {
       const q = this.clone();
@@ -11658,7 +12284,6 @@ class Db {
       }
       return toSQL.call(q, options2);
     } : toSQL;
-    this.relations = {};
     if (modifyQuery) {
       for (const cb of modifyQuery) {
         cb(this);
@@ -11956,16 +12581,6 @@ const testTransaction = {
   }
 };
 
-function addComputedColumns(q, computed) {
-  const { shape } = q;
-  for (const key in computed) {
-    const expr = computed[key](q);
-    shape[key] = expr.result.value;
-    expr.result.value.data.computed = expr;
-  }
-  return q;
-}
-
 const rowToColumnInfo = (row) => {
   const typed = row;
   return {
@@ -12022,6 +12637,7 @@ exports.CitextColumn = CitextColumn;
 exports.Clear = Clear;
 exports.ColumnRefExpression = ColumnRefExpression;
 exports.ColumnType = ColumnType;
+exports.ComputedColumn = ComputedColumn;
 exports.Create = Create;
 exports.CustomTypeColumn = CustomTypeColumn;
 exports.DateBaseColumn = DateBaseColumn;
@@ -12162,11 +12778,11 @@ exports._queryWhereIn = _queryWhereIn;
 exports._queryWhereNot = _queryWhereNot;
 exports._queryWhereNotSql = _queryWhereNotSql;
 exports._queryWhereSql = _queryWhereSql;
-exports.addComputedColumns = addComputedColumns;
 exports.addParserForRawExpression = addParserForRawExpression;
 exports.addParserForSelectItem = addParserForSelectItem;
 exports.addQueryOn = addQueryOn;
 exports.anyShape = anyShape;
+exports.applyComputedColumns = applyComputedColumns;
 exports.checkIfASimpleQuery = checkIfASimpleQuery;
 exports.cloneQuery = cloneQuery;
 exports.cloneQueryBaseUnscoped = cloneQueryBaseUnscoped;
@@ -12183,6 +12799,7 @@ exports.countSelect = countSelect;
 exports.createDb = createDb;
 exports.defaultSchemaConfig = defaultSchemaConfig;
 exports.extendQuery = extendQuery;
+exports.filterResult = filterResult;
 exports.foreignKeyArgumentToCode = foreignKeyArgumentToCode;
 exports.getClonedQueryData = getClonedQueryData;
 exports.getColumnInfo = getColumnInfo;
@@ -12208,10 +12825,11 @@ exports.makeFnExpression = makeFnExpression;
 exports.makeRegexToFindInSql = makeRegexToFindInSql;
 exports.makeSQL = makeSQL;
 exports.parseRecord = parseRecord;
-exports.parseResult = parseResult;
 exports.parseTableData = parseTableData;
 exports.parseTableDataInput = parseTableDataInput;
 exports.primaryKeyInnerToCode = primaryKeyInnerToCode;
+exports.processComputedBatches = processComputedBatches;
+exports.processComputedResult = processComputedResult;
 exports.processSelectArg = processSelectArg;
 exports.pushLimitSQL = pushLimitSQL;
 exports.pushQueryArray = pushQueryArray;