pqb 0.40.10 → 0.40.11

package/dist/index.mjs

@@ -1775,8 +1775,24 @@ const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
 const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
   var _a, _b, _c;
   if (key === "*") {
-    if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-      return select ? `row_to_json("${table}".*) "${as}"` : `"${table}".r "${as}"`;
+    const shape = (_a = data.joinedShapes) == null ? void 0 : _a[table];
+    if (shape) {
+      if (select) {
+        let isSimple = true;
+        const list = [];
+        for (const key2 in shape) {
+          const column2 = shape[key2];
+          if (column2.data.explicitSelect || column2 instanceof VirtualColumn) {
+            continue;
+          }
+          if (column2.data.name) {
+            isSimple = false;
+          }
+          list.push(`'${key2}'`, `"${table}"."${column2.data.name || key2}"`);
+        }
+        return (isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")") + ` "${as}"`;
+      }
+      return `"${table}".r "${as}"`;
     }
     return column;
   }
@@ -1896,8 +1912,10 @@ class QueryError extends OrchidOrmInternalError {
       const list = (_a = this.detail.match(/\((.*)\)=/)) == null ? void 0 : _a[1];
       if (list) {
         list.split(", ").forEach((item) => {
+          var _a2;
           const column = item.startsWith('"') ? item.slice(1, -1) : item;
-          columns[column] = true;
+          const key = (_a2 = this.query.columnNameToKey(column)) != null ? _a2 : column;
+          columns[key] = true;
         });
       }
     }
@@ -1947,6 +1965,17 @@ const throwIfNoWhere = (q, method) => {
     );
   }
 };
+const throwIfJoinLateral = (q, method) => {
+  var _a;
+  if ((_a = q.q.join) == null ? void 0 : _a.some(
+    (x) => Array.isArray(x) || "s" in x.args && x.args.s
+  )) {
+    throw new OrchidOrmInternalError(
+      q,
+      `Cannot join a complex query in ${method}`
+    );
+  }
+};
 const saveSearchAlias = (q, as, key) => {
   const shapes = q.q[key];
   if (shapes == null ? void 0 : shapes[as]) {
@@ -2650,16 +2679,16 @@ const _join = (query, require2, type, first, args) => {
     if (require2 && isQueryNone(first)) {
       return _queryNone(query);
     }
-    const q = first;
-    joinSubQuery = getIsJoinSubQuery(q);
-    joinKey = q.q.as || q.table;
+    const q2 = first;
+    joinSubQuery = getIsJoinSubQuery(q2);
+    joinKey = q2.q.as || q2.table;
     if (joinKey) {
-      shape = getShapeFromSelect(q, joinSubQuery);
-      parsers = q.q.parsers;
-      batchParsers = q.q.batchParsers;
-      computeds = q.q.computeds;
+      shape = getShapeFromSelect(q2, joinSubQuery && !!q2.q.select);
+      parsers = q2.q.parsers;
+      batchParsers = q2.q.batchParsers;
+      computeds = q2.q.computeds;
       if (joinSubQuery) {
-        first = q.clone();
+        first = q2.clone();
         first.shape = shape;
       }
     }
@@ -2742,10 +2771,14 @@ const _join = (query, require2, type, first, args) => {
       computeds
     );
   }
-  return pushQueryValue(query, "join", {
+  const q = pushQueryValue(query, "join", {
     type,
     args: joinArgs
   });
+  if (query.q.type === "delete") {
+    throwIfJoinLateral(q, query.q.type);
+  }
+  return q;
 };
 const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, computeds) => {
   var _a, _b;
@@ -3549,7 +3582,9 @@ const applyComputedColumns = (q, fn) => {
     if (item instanceof ComputedColumn) {
       q.q.computeds = __spreadProps$5(__spreadValues$e({}, q.q.computeds), { [key]: item });
     } else {
-      (q.shape[key] = item.result.value || UnknownColumn.instance).data.computed = item;
+      const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
+      data.computed = item;
+      data.explicitSelect = true;
     }
   }
   q.computeAtRuntime = q.computeBatchAtRuntime = void 0;
@@ -3964,6 +3999,16 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
         error.cause = localError;
       }
     }
+    const stack = localError.stack;
+    if (stack) {
+      const from = stack.indexOf("\n");
+      if (from !== -1) {
+        const to = stack.indexOf("\n", from + 1);
+        if (to !== -1) {
+          localError.stack = stack.slice(0, from) + stack.slice(to);
+        }
+      }
+    }
     if (log && sql) {
       log.onError(error, sql, logData);
     }
@@ -5775,7 +5820,7 @@ const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
 };
 
 const pushDeleteSql = (ctx, table, query, quotedAs) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const from = `"${table.table}"`;
   ctx.sql.push(`DELETE FROM ${from}`);
   if (from !== quotedAs) {
@@ -5787,27 +5832,16 @@ 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)) {
-        const q = item[1];
-        const { aliasValue } = ctx;
-        ctx.aliasValue = true;
-        const as = item[2];
-        targets.push(
-          `LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_b = query.joinOverrides) == null ? void 0 : _b[as]) || as}"`
-        );
-        ctx.aliasValue = aliasValue;
-      } else {
-        const join = processJoinItem(ctx, table, query, item.args, quotedAs);
-        const key = `${join.target}${join.on}`;
-        if (joinSet) {
-          if (joinSet.has(key))
-            continue;
-          joinSet.add(key);
-        }
-        targets.push(join.target);
-        if (join.on)
-          ons.push(join.on);
+      const join = processJoinItem(ctx, table, query, item.args, quotedAs);
+      const key = `${join.target}${join.on}`;
+      if (joinSet) {
+        if (joinSet.has(key))
+          continue;
+        joinSet.add(key);
       }
+      targets.push(join.target);
+      if (join.on)
+        ons.push(join.on);
     }
     if (targets.length) {
       ctx.sql.push(`USING ${targets.join(", ")}`);
@@ -5816,7 +5850,7 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
   if (conditions) {
-    if (((_c = query.and) == null ? void 0 : _c.length) || ((_d = query.or) == null ? void 0 : _d.length) || query.scopes) {
+    if (((_b = query.and) == null ? void 0 : _b.length) || ((_c = query.or) == null ? void 0 : _c.length) || query.scopes) {
       ctx.sql.push("AND", conditions);
     } else {
       ctx.sql.push("WHERE", conditions);
@@ -8196,6 +8230,7 @@ const _queryDelete = (query) => {
     q.returnType = "rowCount";
   }
   throwIfNoWhere(query, "delete");
+  throwIfJoinLateral(query, "delete");
   q.type = "delete";
   return query;
 };
@@ -12784,16 +12819,18 @@ class Db {
       applyComputedColumns(this, options.computed);
     if (prepareSelectAll) {
       const list = [];
+      const keys = {};
       for (const key in shape) {
         const column = shape[key];
         if (!column.data.explicitSelect) {
           list.push(
             column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
           );
+          keys[key] = column;
         }
       }
       this.q.selectAllColumns = list;
-      this.q.selectAllKeys = __spreadValues({}, shape);
+      this.q.selectAllKeys = keys;
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {
@@ -12886,6 +12923,23 @@ class Db {
   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) {
+    var _a;
+    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((_a = column.data.name) != null ? _a : key, key);
+      }
+    }
+    return map.get(name);
+  }
 }
 const performQuery = async (q, args, method) => {
   var _a;
@@ -13145,5 +13199,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map