pqb 0.51.1 → 0.51.3

package/dist/index.mjs

@@ -446,8 +446,7 @@ const simplifyColumnDefault = (value) => {
   }
   return;
 };
-const instantiateColumn = (typeFn, params) => {
-  const column = typeFn();
+const assignDbDataToColumn = (column, params) => {
   const { dateTimePrecision } = params;
   Object.assign(column.data, {
     ...params,
@@ -3054,7 +3053,8 @@ const applyComputedColumns = (q, fn) => {
   q.computeBatchAtRuntime = computeBatchAtRuntime;
   const computed = fn(q);
   for (const key in computed) {
-    const item = computed[key];
+    let item = computed[key];
+    if (typeof item === "function") item = item.call(computed);
     if (item instanceof ComputedColumn) {
       q.q.computeds = {
         ...q.q.computeds,
@@ -3367,9 +3367,13 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     let renames;
     if (hookSelect) {
       for (const column of hookSelect.keys()) {
-        const as = hookSelect.get(column).as;
-        if (as) (renames ?? (renames = {}))[column] = as;
-        (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(as || column);
+        const { as, temp } = hookSelect.get(column);
+        if (as) {
+          (renames ?? (renames = {}))[column] = as;
+        }
+        if (temp) {
+          (tempColumns ?? (tempColumns = /* @__PURE__ */ new Set()))?.add(temp);
+        }
       }
       if (renames) {
         for (const record of result) {
@@ -3436,9 +3440,11 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     }
     if (hookSelect || tempReturnType !== returnType) {
       if (renames) {
-        for (const record of result) {
-          for (const a in renames) {
+        for (const a in renames) {
+          for (const record of result) {
+            const value = record[a];
             record[a] = record[renames[a]];
+            record[renames[a]] = value;
           }
         }
       }
@@ -3481,7 +3487,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (log && sql) {
       log.onError(error, sql, logData);
     }
-    return reject?.(error);
+    if (reject) return reject(error);
+    throw error;
   }
 };
 const execQuery = (adapter, method, sql) => {
@@ -3904,7 +3911,7 @@ const addParsersForSelectJoined = (q, arg, as = arg) => {
     );
   }
 };
-const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
+const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
   if (typeof arg === "object" || typeof arg === "function") {
     const { q: query } = arg;
     if (query.batchParsers) {
@@ -4076,7 +4083,13 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
     }
     return arg;
   }
-  return setParserForSelectedString(q, arg, as, key);
+  return setParserForSelectedString(
+    q,
+    arg,
+    as,
+    key,
+    columnAlias
+  );
 };
 const collectNestedSelectBatches = (batches, rows, path, last) => {
   const stack = rows.map(
@@ -4168,15 +4181,18 @@ const processSelectArg = (q, as, arg, columnAs) => {
       as,
       key,
       value,
+      key,
       joinQuery
     );
   }
   return { selectAs };
 };
-const setParserForSelectedString = (query, arg, as, columnAs) => {
+const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
   const { q } = query;
   const index = arg.indexOf(".");
-  if (index === -1) return selectColumn(query, q, arg, columnAs);
+  if (index === -1) {
+    return selectColumn(query, q, arg, columnAs, columnAlias);
+  }
   const table = getFullColumnTable(query, arg, index, as);
   const column = arg.slice(index + 1);
   if (column === "*") {
@@ -4184,7 +4200,7 @@ const setParserForSelectedString = (query, arg, as, columnAs) => {
     return table === as ? column : arg;
   }
   if (table === as) {
-    return selectColumn(query, q, column, columnAs);
+    return selectColumn(query, q, column, columnAs, columnAlias);
   }
   const parser = q.joinedParsers?.[table]?.[column];
   if (parser) setParserToQuery(q, columnAs || column, parser);
@@ -4213,24 +4229,24 @@ const setParserForSelectedString = (query, arg, as, columnAs) => {
   }
   return arg;
 };
-const selectColumn = (query, q, key, columnAs) => {
+const selectColumn = (query, q, key, columnAs, columnAlias) => {
   if (columnAs && q.parsers) {
     const parser = q.parsers[key];
     if (parser) setObjectValueImmutable(q, "parsers", columnAs, parser);
   }
-  return handleComputed(query, q.computeds, key);
-};
-const handleComputed = (q, computeds, column) => {
-  if (computeds?.[column]) {
-    const computed = computeds[column];
-    const map = q.q.hookSelect = new Map(q.q.hookSelect);
-    for (const column2 of computed.deps) {
-      map.set(column2, { select: column2 });
+  if (q.computeds?.[key]) {
+    const computed = q.computeds[key];
+    const map = query.q.hookSelect = new Map(query.q.hookSelect);
+    for (const key2 of computed.deps) {
+      map.set(key2, { select: key2 });
     }
-    q.q.selectedComputeds = { ...q.q.selectedComputeds, [column]: computed };
+    query.q.selectedComputeds = {
+      ...query.q.selectedComputeds,
+      [columnAlias || key]: computed
+    };
     return;
   }
-  return column;
+  return key;
 };
 const getShapeFromSelect = (q, isSubQuery) => {
   const query = q.q;
@@ -4250,7 +4266,9 @@ const getShapeFromSelect = (q, isSubQuery) => {
       result = {};
       for (const key in shape) {
         const column = shape[key];
-        result[key] = column.data.name ? setColumnData(column, "name", void 0) : column;
+        if (!column.data.explicitSelect) {
+          result[key] = column.data.name ? setColumnData(column, "name", void 0) : column;
+        }
       }
     } else {
       result = shape;
@@ -4310,10 +4328,12 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
     }
   } else if (arg === "*") {
     for (const key2 in shape) {
-      result[key2] = mapSubSelectColumn(
-        shape[key2],
-        isSubQuery
-      );
+      if (!shape[key2].data.explicitSelect) {
+        result[key2] = mapSubSelectColumn(
+          shape[key2],
+          isSubQuery
+        );
+      }
     }
   } else {
     result[key || arg] = mapSubSelectColumn(
@@ -4832,6 +4852,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
     return query.inCTE.selectNum || !select ? select ? "0, " + select : "0" : select;
   }
   let selected;
+  let selectedAs;
   const list = [];
   if (query.select) {
     for (const item of query.select) {
@@ -4840,8 +4861,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if (item === "*") {
           if (hookSelect) {
             selected ?? (selected = {});
-            for (const key in query.selectableShape) {
+            selectedAs ?? (selectedAs = {});
+            for (const key in query.selectAllShape) {
               selected[key] = quotedAs;
+              selectedAs[key] = key;
             }
           }
           sql = selectAllSql(query, quotedAs, jsonList);
@@ -4852,6 +4875,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
             const key = item.slice(index + 1);
             if (hookSelect?.get(key)) {
               (selected ?? (selected = {}))[key] = `"${tableName}"`;
+              (selectedAs ?? (selectedAs = {}))[key] = key;
             }
             sql = tableColumnToSqlWithAs(
               ctx,
@@ -4865,7 +4889,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               jsonList
             );
           } else {
-            if (hookSelect?.get(item)) (selected ?? (selected = {}))[item] = quotedAs;
+            if (hookSelect?.get(item)) {
+              (selected ?? (selected = {}))[item] = quotedAs;
+              (selectedAs ?? (selectedAs = {}))[item] = item;
+            }
             sql = ownColumnToSqlWithAs(
               ctx,
               table.q,
@@ -4883,7 +4910,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if ("selectAs" in item) {
           const obj = item.selectAs;
           for (const as in obj) {
-            if (hookSelect) (selected ?? (selected = {}))[as] = true;
+            if (hookSelect) {
+              (selected ?? (selected = {}))[as] = true;
+            }
             const value = obj[as];
             if (typeof value === "object") {
               if (isExpression(value)) {
@@ -4899,6 +4928,9 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
                 }
               }
             } else if (value) {
+              if (hookSelect) {
+                (selectedAs ?? (selectedAs = {}))[value] = as;
+              }
               list.push(
                 columnToSqlWithAs(
                   ctx,
@@ -4955,9 +4987,17 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         let i = 2;
         while (selected[name = `${column}${i}`]) i++;
         item.as = name;
+        item.temp = name;
         sql += ` "${name}"`;
-      } else if (col?.data.name || typeof select === "object") {
-        sql += ` "${columnName}"`;
+      } else if (selectedAs?.[columnName]) {
+        item.as = selectedAs[columnName];
+        item.temp = columnName;
+        continue;
+      } else {
+        if (col?.data.name || typeof select === "object") {
+          sql += ` "${columnName}"`;
+        }
+        item.temp = columnName;
       }
       if (jsonList) jsonList[name] = col;
       list.push(sql);
@@ -4971,7 +5011,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 }
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
-    Object.assign(jsonList, query.selectableShape);
+    Object.assign(jsonList, query.selectAllShape);
   }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
@@ -11771,7 +11811,7 @@ class ExpressionMethods {
   column(name) {
     const column = this.shape[name];
     return new ColumnRefExpression(
-      column,
+      column || UnknownColumn.instance,
       name
     );
   }
@@ -11813,12 +11853,12 @@ class ExpressionMethods {
       if (table === as) {
         column = shape[col];
       } else {
-        column = q.q.joinedShapes[table][col];
+        column = q.q.joinedShapes?.[table][col];
       }
     } else {
       column = shape[arg];
     }
-    return new RefExpression(column, q, arg);
+    return new RefExpression(column || UnknownColumn.instance, q, arg);
   }
   val(value) {
     return new ValExpression(value);
@@ -12698,7 +12738,7 @@ const parseIndexOrExclude = (item) => {
 
 const anyShape = {};
 class Db extends QueryMethods {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = emptyObject) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = {}) {
     super();
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
@@ -12792,26 +12832,21 @@ class Db extends QueryMethods {
     );
     this.columns = columns;
     if (options.computed) applyComputedColumns(this, options.computed);
-    const selectableShape = this.q.selectableShape = {};
     if (prepareSelectAll) {
+      const selectAllShape = this.q.selectAllShape = {};
       const list = [];
       for (const key in shape) {
         const column = shape[key];
-        if (!column.data.explicitSelect && !(column instanceof VirtualColumn)) {
+        if (!column.data.explicitSelect) {
           list.push(
             column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
-          selectableShape[key] = column;
+          selectAllShape[key] = column;
         }
       }
       this.q.selectAllColumns = list;
     } else {
-      for (const key in shape) {
-        const column = shape[key];
-        if (column instanceof VirtualColumn) {
-          selectableShape[key] = column;
-        }
-      }
+      this.q.selectAllShape = shape;
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {
@@ -13167,5 +13202,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, 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, _clone, _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, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
+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, 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, _clone, _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, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, assignDbDataToColumn, checkIfASimpleQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
 //# sourceMappingURL=index.mjs.map