pqb 0.9.24 → 0.9.26

package/dist/index.d.ts

@@ -271,7 +271,7 @@ declare const getRawSql: (raw: RawExpression) => string;
 declare type CommonQueryData = {
     adapter: Adapter;
     shape: ColumnsShapeBase;
-    handleResult(q: Query, result: QueryResult): Promise<unknown>;
+    handleResult(q: Query, result: QueryResult, isSubQuery?: true): Promise<unknown>;
     returnType: QueryReturnType;
     [relationQueryKey]?: RelationQueryData;
     inTransaction?: boolean;
@@ -467,7 +467,7 @@ declare type JoinItem = {
     type: string;
     args: [relation: string] | [
         arg: string | QueryWithTable,
-        conditions: Record<string, string | RawExpression> | RawExpression | ((q: unknown) => QueryBase)
+        conditions: Record<string, string | RawExpression> | RawExpression | ((q: unknown) => QueryBase) | true
     ] | [
         arg: string | QueryWithTable,
         leftColumn: string | RawExpression,
@@ -599,7 +599,7 @@ declare class Then {
 }
 declare const handleResult: CommonQueryData['handleResult'];
 declare function maybeWrappedThen(this: Query, resolve?: Resolve, reject?: Reject): Promise<any>;
-declare const parseResult: (q: Query, returnType: QueryReturnType | undefined, result: QueryResult) => unknown;
+declare const parseResult: (q: Query, returnType: QueryReturnType | undefined, result: QueryResult, isSubQuery?: boolean) => unknown;
 declare const parseRecord: (parsers: ColumnsParsers, row: any) => any;
 
 declare type GetArg<T extends QueryBase> = StringKey<keyof T['selectable']> | RawExpression;
@@ -792,7 +792,7 @@ declare type JoinArgs<T extends QueryBase, Q extends Query = Query, R extends ke
     leftColumn: WithSelectable<T, W> | RawExpression,
     op: string,
     rightColumn: Selectable<T> | RawExpression
-];
+] | [query: Q, conditions: true];
 declare type JoinResult<T extends Query, Args extends JoinArgs<T>, A extends Query | keyof T['relations'] = Args[0]> = AddQueryJoinedTable<T, A extends Query ? A : T['relations'] extends Record<string, Relation> ? A extends keyof T['relations'] ? T['relations'][A]['table'] : A extends keyof T['withData'] ? T['withData'][A] extends WithDataItem ? {
     table: T['withData'][A]['table'];
     result: T['withData'][A]['shape'];

package/dist/index.js

@@ -285,13 +285,17 @@ const processJoinItem = (ctx, table, args, quotedAs) => {
     const query = first.query;
     const quotedFrom = typeof query.from === "string" ? q(query.from) : void 0;
     target = quotedFrom || quoteSchemaAndTable(query.schema, first.table);
+    const subQuery = first.toSql({
+      values: ctx.values
+    });
     let joinAs = quotedFrom || q(first.table);
-    if (query.as) {
-      const quoted = q(query.as);
-      if (quoted !== joinAs) {
-        joinAs = quoted;
-        target += ` AS ${quoted}`;
-      }
+    const qAs = query.as ? q(query.as) : void 0;
+    const addAs = qAs && qAs !== joinAs;
+    if (subQuery.text !== `SELECT * FROM ${target}${addAs ? ` AS ${qAs}` : ""}`) {
+      target = `(${subQuery.text}) ${qAs || joinAs}`;
+    } else if (addAs) {
+      joinAs = qAs;
+      target += ` AS ${qAs}`;
     }
     conditions = processArgs(args, ctx, table, first, joinAs, quotedAs);
     const whereSql = whereToSql(ctx, table, query, joinAs);
@@ -340,7 +344,9 @@ const getConditionsFor3Or4LengthItem = (target, values, quotedAs, args) => {
   return `${typeof leftColumn === "string" ? quoteFullColumn(leftColumn, target) : getRaw(leftColumn, values)} ${op} ${typeof rightColumn === "string" ? quoteFullColumn(rightColumn, quotedAs) : getRaw(rightColumn, values)}`;
 };
 const getObjectOrRawConditions = (data, values, quotedAs, joinAs) => {
-  if (isRaw(data)) {
+  if (data === true) {
+    return "true";
+  } else if (isRaw(data)) {
     return getRaw(data, values);
   } else {
     const pairs = [];
@@ -395,6 +401,7 @@ const processAnds = (and, ctx, table, quotedAs, not) => {
   return ands.join(" AND ");
 };
 const processWhere = (ands, ctx, table, data, quotedAs, not) => {
+  var _a, _b;
   const prefix = not ? "NOT " : "";
   if (typeof data === "function") {
     const qb = data(new ctx.whereQueryBuilder(table, table.query.shape));
@@ -489,9 +496,23 @@ const processWhere = (ands, ctx, table, data, quotedAs, not) => {
           )}`
         );
       } else {
-        const column = table.query.shape[key];
-        if (!column) {
-          throw new Error(`Unknown column ${key} provided to condition`);
+        let column = table.query.shape[key];
+        let quotedColumn;
+        if (column) {
+          quotedColumn = qc(key, quotedAs);
+        } else if (!column) {
+          const index = key.indexOf(".");
+          if (index !== -1) {
+            const joinedTable = key.slice(0, index);
+            const joinedColumn = key.slice(index + 1);
+            column = (_b = (_a = table.query.joinedShapes) == null ? void 0 : _a[joinedTable]) == null ? void 0 : _b[joinedColumn];
+            quotedColumn = qc(joinedColumn, q(joinedTable));
+          } else {
+            quotedColumn = void 0;
+          }
+          if (!column || !quotedColumn) {
+            throw new Error(`Unknown column ${key} provided to condition`);
+          }
         }
         for (const op in value) {
           const operator = column.operators[op];
@@ -500,7 +521,7 @@ const processWhere = (ands, ctx, table, data, quotedAs, not) => {
           }
           ands.push(
             `${prefix}${operator(
-              qc(key, quotedAs),
+              quotedColumn,
               value[op],
               ctx.values
             )}`
@@ -4346,6 +4367,9 @@ class QueryGet {
   }
 }
 
+class UnknownColumn extends VirtualColumn {
+}
+
 const queryMethodByReturnType = {
   all: "query",
   rows: "arrays",
@@ -4367,8 +4391,8 @@ class Then {
     return this.then(void 0, fn);
   }
 }
-const handleResult = async (q, result) => {
-  return parseResult(q, q.query.returnType || "all", result);
+const handleResult = async (q, result, isSubQuery) => {
+  return parseResult(q, q.query.returnType || "all", result, isSubQuery);
 };
 function maybeWrappedThen(resolve, reject) {
   if (this.query.wrapInTransaction && !this.query.inTransaction) {
@@ -4464,7 +4488,7 @@ const assignError = (to, from) => {
   to.routine = from.routine;
   return to;
 };
-const parseResult = (q, returnType = "all", result) => {
+const parseResult = (q, returnType = "all", result, isSubQuery) => {
   var _a, _b;
   switch (returnType) {
     case "all": {
@@ -4498,7 +4522,12 @@ const parseResult = (q, returnType = "all", result) => {
     case "pluck": {
       const { parsers } = q.query;
       if (parsers == null ? void 0 : parsers.pluck) {
+        if (isSubQuery) {
+          return result.rows.map((row) => parsers.pluck(row));
+        }
         return result.rows.map((row) => parsers.pluck(row[0]));
+      } else if (isSubQuery) {
+        return result.rows;
       }
       return result.rows.map((row) => row[0]);
     }
@@ -4556,9 +4585,6 @@ const getCallbacks = (first, second) => {
   return first && second ? [...first, ...second] : first ? first : second;
 };
 
-class UnknownColumn extends VirtualColumn {
-}
-
 const addParserForRawExpression = (q, key, raw) => {
   var _a;
   const parser = (_a = raw.__column) == null ? void 0 : _a.parseFn;
@@ -4583,7 +4609,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
       addParserToQuery(q.query, key, (item) => {
         const t = rel.query.returnType || "all";
         subQueryResult.rows = t === "all" || t === "rows" || t === "pluck" ? item : [item];
-        return parseResult(rel, t, subQueryResult);
+        return parseResult(rel, t, subQueryResult, true);
       });
     }
     return rel;
@@ -5461,11 +5487,11 @@ const insert = (self, {
   }
   if (returnType === "oneOrThrow" || ((_a = q.query.fromQuery) == null ? void 0 : _a.query.returnType) === "oneOrThrow") {
     const { handleResult } = q.query;
-    q.query.handleResult = async (q2, r) => {
+    q.query.handleResult = async (q2, r, i) => {
       if (r.rowCount === 0) {
         throw new NotFoundError();
       }
-      return await handleResult(q2, r);
+      return await handleResult(q2, r, i);
     };
   }
   const requiredColumns = Object.keys(ctx.requiredReturning);
@@ -5481,11 +5507,11 @@ const insert = (self, {
   if (ctx.returnTypeAll) {
     q.query.returnType = "all";
     const { handleResult } = q.query;
-    q.query.handleResult = async (q2, queryResult) => {
-      ctx.resultAll = await handleResult(q2, queryResult);
+    q.query.handleResult = async (q2, queryResult, i) => {
+      ctx.resultAll = await handleResult(q2, queryResult, i);
       if (queryMethodByReturnType[returnType] === "arrays") {
         queryResult.rows.forEach(
-          (row, i) => queryResult.rows[i] = Object.values(row)
+          (row, i2) => queryResult.rows[i2] = Object.values(row)
         );
       }
       return parseResult(q2, returnType, queryResult);
@@ -5873,6 +5899,9 @@ class OnQueryBuilder extends WhereQueryBuilder {
   constructor(q, shape, joinTo) {
     super(q, shape);
     this.joinTo = joinTo;
+    this.query.joinedShapes = {
+      [joinTo.query.as || joinTo.table]: joinTo.shape
+    };
   }
   on(...args) {
     return this.clone()._on(...args);
@@ -6304,8 +6333,8 @@ class Update {
     if (ctx.updateLater || ctx.returnTypeAll) {
       query.returnType = "all";
       const { handleResult } = query;
-      query.handleResult = async (q, queryResult) => {
-        ctx.resultAll = await handleResult(q, queryResult);
+      query.handleResult = async (q, queryResult, i) => {
+        ctx.resultAll = await handleResult(q, queryResult, i);
         if (ctx.updateLater) {
           await Promise.all(ctx.updateLaterPromises);
           const t = this.baseQuery.clone().transacting(q);
@@ -6319,7 +6348,7 @@ class Update {
         }
         if (queryMethodByReturnType[originalReturnType] === "arrays") {
           queryResult.rows.forEach(
-            (row, i) => queryResult.rows[i] = Object.values(row)
+            (row, i2) => queryResult.rows[i2] = Object.values(row)
           );
         }
         q.query.returnType = originalReturnType;
@@ -6475,7 +6504,7 @@ class QueryUpsertOrCreate {
     this.query.returnType = "one";
     this.query.wrapInTransaction = true;
     const { handleResult } = this.query;
-    this.query.handleResult = async (q, queryResult) => {
+    this.query.handleResult = async (q, queryResult, i) => {
       if (queryResult.rowCount === 0) {
         return q.create(data);
       } else if (queryResult.rowCount > 1) {
@@ -6483,7 +6512,7 @@ class QueryUpsertOrCreate {
           `Only one row was expected to find, found ${queryResult.rowCount} rows.`
         );
       }
-      return handleResult(q, queryResult);
+      return handleResult(q, queryResult, i);
     };
     return this;
   }