pqb 0.26.0 → 0.26.1

package/dist/index.d.ts

@@ -863,6 +863,35 @@ declare class Join {
      *
      * When no matching record is found, it will skip records of the main table.
      *
+     * When joining the same table with the same condition more than once, duplicated joins will be ignored:
+     *
+     * ```ts
+     * // joining a relation
+     * db.post.join('comments').join('comments');
+     *
+     * // joining a table with a condition
+     * db.post
+     *   .join('comments', 'comments.postId', 'post.id')
+     *   .join('comments', 'comments.postId', 'post.id');
+     * ```
+     *
+     * Both queries will produce SQL with only 1 join
+     *
+     * ```sql
+     * SELECT * FROM post JOIN comments ON comments.postId = post.id
+     * ```
+     *
+     * However, this is only possible if the join has no dynamic values:
+     *
+     * ```ts
+     * db.post
+     *   .join('comments', (q) => q.where({ rating: { gt: 5 } }))
+     *   .join('comments', (q) => q.where({ rating: { gt: 5 } }));
+     * ```
+     *
+     * Both joins above have the same `{ gt: 5 }`, but still, the `5` is a dynamic value and in this case joins will be duplicated,
+     * resulting in a database error.
+     *
      * ### join relation
      *
      * When relations are defined between the tables, you can join them by a relation name.

package/dist/index.js

@@ -656,6 +656,7 @@ const columnCode = (type, t, code, data = type.data, skip) => {
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
 
+const joinStatementsSet = /* @__PURE__ */ new Set();
 function simpleColumnToSQL(ctx, key, column, quotedAs) {
   if (!column)
     return `"${key}"`;
@@ -991,6 +992,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       });
     } else if (key === "EXISTS") {
       const joinItems = Array.isArray(value[0]) ? value : [value];
+      joinStatementsSet.clear();
       for (const args of joinItems) {
         const { target, conditions } = processJoinItem(
           ctx,
@@ -999,7 +1001,11 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
           args,
           quotedAs
         );
-        ands.push(`EXISTS (SELECT 1 FROM ${target} WHERE ${conditions})`);
+        const sql = `EXISTS (SELECT 1 FROM ${target} WHERE ${conditions})`;
+        if (!joinStatementsSet.has(sql)) {
+          joinStatementsSet.add(sql);
+          ands.push(sql);
+        }
       }
     } else if (key === "SEARCH") {
       const search = value;
@@ -1316,15 +1322,15 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 };
 const pushJoinSql = (ctx, table, query, quotedAs) => {
   var _a;
+  joinStatementsSet.clear();
   for (const item of query.join) {
+    let sql;
     if (Array.isArray(item)) {
       const q = item[1];
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      ctx.sql.push(
-        `${item[0]} LATERAL (${q.toSQL(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`
-      );
+      sql = `${item[0]} LATERAL (${q.toSQL(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, conditions } = processJoinItem(
@@ -1334,9 +1340,11 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
         item,
         quotedAs
       );
-      ctx.sql.push(item.type, target);
-      if (conditions)
-        ctx.sql.push("ON", conditions);
+      sql = conditions ? `${item.type} ${target} ON ${conditions}` : `${item.type} ${target} ON true`;
+    }
+    if (!joinStatementsSet.has(sql)) {
+      joinStatementsSet.add(sql);
+      ctx.sql.push(sql);
     }
   }
 };
@@ -2921,9 +2929,15 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   let conditions;
   if ((_a = query.join) == null ? void 0 : _a.length) {
     const items = [];
+    joinStatementsSet.clear();
     for (const item of query.join) {
       if (!Array.isArray(item)) {
-        items.push(processJoinItem(ctx, table, query, item, quotedAs));
+        const join = processJoinItem(ctx, table, query, item, quotedAs);
+        const key = `${join.target}${join.conditions}`;
+        if (!joinStatementsSet.has(key)) {
+          joinStatementsSet.add(key);
+          items.push(join);
+        }
       }
     }
     if (items.length) {
@@ -7357,6 +7371,35 @@ class Join {
    *
    * When no matching record is found, it will skip records of the main table.
    *
+   * When joining the same table with the same condition more than once, duplicated joins will be ignored:
+   *
+   * ```ts
+   * // joining a relation
+   * db.post.join('comments').join('comments');
+   *
+   * // joining a table with a condition
+   * db.post
+   *   .join('comments', 'comments.postId', 'post.id')
+   *   .join('comments', 'comments.postId', 'post.id');
+   * ```
+   *
+   * Both queries will produce SQL with only 1 join
+   *
+   * ```sql
+   * SELECT * FROM post JOIN comments ON comments.postId = post.id
+   * ```
+   *
+   * However, this is only possible if the join has no dynamic values:
+   *
+   * ```ts
+   * db.post
+   *   .join('comments', (q) => q.where({ rating: { gt: 5 } }))
+   *   .join('comments', (q) => q.where({ rating: { gt: 5 } }));
+   * ```
+   *
+   * Both joins above have the same `{ gt: 5 }`, but still, the `5` is a dynamic value and in this case joins will be duplicated,
+   * resulting in a database error.
+   *
    * ### join relation
    *
    * When relations are defined between the tables, you can join them by a relation name.