pqb 0.42.5 → 0.42.6

package/dist/index.mjs

@@ -3287,6 +3287,10 @@ const _queryRows = (q) => {
   q.q.returnType = "rows";
   return q;
 };
+const getFullColumnTable = (q, column, index, as) => {
+  const table = column.slice(0, index);
+  return as && table !== as && q.q.aliases?.[table] === as ? as : table;
+};
 
 const _join = (query, require, type, first, args) => {
   var _a;
@@ -5054,43 +5058,43 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
   var _a, _b;
   const index = arg.indexOf(".");
   if (index !== -1) {
-    const table = arg.slice(0, index);
+    const table = getFullColumnTable(q, arg, index, as);
     const column = arg.slice(index + 1);
     if (column === "*") {
       addParsersForSelectJoined(q, table, columnAs);
       return table === as ? column : arg;
-    } else if (table === as) {
+    }
+    if (table === as) {
       if (columnAs) {
-        const parser = q.q.parsers?.[column];
-        if (parser) q.q.parsers[columnAs] = parser;
+        const parser2 = q.q.parsers?.[column];
+        if (parser2) q.q.parsers[columnAs] = parser2;
       }
       return handleComputed(q, q.q.computeds, column);
-    } else {
-      const parser = q.q.joinedParsers?.[table]?.[column];
-      if (parser) setParserToQuery(q.q, columnAs || column, parser);
-      const batchParsers = q.q.joinedBatchParsers?.[table];
-      if (batchParsers) {
-        for (const bp of batchParsers) {
-          if (bp.path[0] === column) {
-            ((_a = q.q).batchParsers ?? (_a.batchParsers = [])).push(bp);
-          }
+    }
+    const parser = q.q.joinedParsers?.[table]?.[column];
+    if (parser) setParserToQuery(q.q, columnAs || column, parser);
+    const batchParsers = q.q.joinedBatchParsers?.[table];
+    if (batchParsers) {
+      for (const bp of batchParsers) {
+        if (bp.path[0] === column) {
+          ((_a = q.q).batchParsers ?? (_a.batchParsers = [])).push(bp);
         }
       }
-      const computeds = q.q.joinedComputeds?.[table];
-      if (computeds?.[column]) {
-        const computed = computeds[column];
-        const map = (_b = q.q).hookSelect ?? (_b.hookSelect = /* @__PURE__ */ new Map());
-        for (const column2 of computed.deps) {
-          map.set(column2, { select: `${table}.${column2}` });
-        }
-        q.q.selectedComputeds = {
-          ...q.q.selectedComputeds,
-          [column]: computed
-        };
-        return;
+    }
+    const computeds = q.q.joinedComputeds?.[table];
+    if (computeds?.[column]) {
+      const computed = computeds[column];
+      const map = (_b = q.q).hookSelect ?? (_b.hookSelect = /* @__PURE__ */ new Map());
+      for (const column2 of computed.deps) {
+        map.set(column2, { select: `${table}.${column2}` });
       }
-      return arg;
+      q.q.selectedComputeds = {
+        ...q.q.selectedComputeds,
+        [column]: computed
+      };
+      return;
     }
+    return arg;
   } else {
     if (columnAs) {
       const parser = q.q.parsers?.[arg];
@@ -5166,9 +5170,10 @@ const getShapeFromSelect = (q, isSubQuery) => {
 const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, key) => {
   const index = arg.indexOf(".");
   if (index !== -1) {
-    const table = arg.slice(0, index);
+    const as = q.q.as || q.table;
+    const table = getFullColumnTable(q, arg, index, as);
     const column = arg.slice(index + 1);
-    if (table === (q.q.as || q.table)) {
+    if (table === as) {
       result[key || column] = shape[column];
     } else {
       const it = query.joinedShapes?.[table]?.[column];
@@ -5262,9 +5267,10 @@ const _getSelectableColumn = (q, arg) => {
   if (!type) {
     const index = arg.indexOf(".");
     if (index !== -1) {
-      const table = arg.slice(0, index);
+      const as = q.q.as || q.table;
+      const table = getFullColumnTable(q, arg, index, as);
       const column = arg.slice(index + 1);
-      if (table === (q.q.as || q.table)) {
+      if (table === as) {
         type = q.shape[column];
       } else {
         type = q.q.joinedShapes?.[table]?.[column];
@@ -11183,9 +11189,10 @@ class ExpressionMethods {
     let column;
     const index = arg.indexOf(".");
     if (index !== -1) {
-      const table = arg.slice(0, index);
+      const as = q.q.as || q.table;
+      const table = getFullColumnTable(q, arg, index, as);
       const col = arg.slice(index + 1);
-      if (table === (q.q.as || q.table)) {
+      if (table === as) {
         column = shape[col];
       } else {
         column = q.q.joinedShapes[table][col];
@@ -11867,9 +11874,12 @@ class QueryMethods {
    * @param fn - helper function
    */
   makeHelper(fn) {
+    const as = this.q.as || this.table;
     return (query, ...args) => {
       const q = _clone(query);
-      q.q.as = void 0;
+      if (q.q.as) {
+        setQueryObjectValue(q, "aliases", as, q.q.as);
+      }
       return fn(q, ...args);
     };
   }
@@ -12486,5 +12496,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, 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, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, 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, 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, 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, getFullColumnTable, 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, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map