pqb 0.9.25 → 0.9.26

package/dist/index.d.ts

@@ -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,
@@ -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
             )}`
@@ -5878,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);