pqb 0.26.1 → 0.26.3

package/dist/index.d.ts

@@ -1338,11 +1338,13 @@ interface JBase {
     result: QueryColumns;
     shape: QueryColumns;
     meta: QueryMetaBase;
+    table?: string;
 }
 declare class OnQueryBuilder<S extends PickQueryMetaShape = QueryBase, J extends JBase = JBase> extends WhereQueryBase {
     selectable: J['meta']['selectable'] & Omit<S['meta']['selectable'], keyof S['shape']>;
     relations: J['relations'];
     result: J['result'];
+    table: J['table'];
     shape: J['shape'];
     withData: {};
     constructor(q: QueryBase, { shape, joinedShapes }: PickQueryDataShapeAndJoinedShapes, joinTo: QueryDataJoinTo);

package/dist/index.js

@@ -656,7 +656,6 @@ 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}"`;
@@ -992,7 +991,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       });
     } else if (key === "EXISTS") {
       const joinItems = Array.isArray(value[0]) ? value : [value];
-      joinStatementsSet.clear();
+      const joinSet = joinItems.length > 1 ? /* @__PURE__ */ new Set() : null;
       for (const args of joinItems) {
         const { target, conditions } = processJoinItem(
           ctx,
@@ -1002,10 +1001,12 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
           quotedAs
         );
         const sql = `EXISTS (SELECT 1 FROM ${target} WHERE ${conditions})`;
-        if (!joinStatementsSet.has(sql)) {
-          joinStatementsSet.add(sql);
-          ands.push(sql);
+        if (joinSet) {
+          if (joinSet.has(sql))
+            continue;
+          joinSet.add(sql);
         }
+        ands.push(sql);
       }
     } else if (key === "SEARCH") {
       const search = value;
@@ -1322,7 +1323,7 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 };
 const pushJoinSql = (ctx, table, query, quotedAs) => {
   var _a;
-  joinStatementsSet.clear();
+  const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
   for (const item of query.join) {
     let sql;
     if (Array.isArray(item)) {
@@ -1342,10 +1343,12 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       );
       sql = conditions ? `${item.type} ${target} ON ${conditions}` : `${item.type} ${target} ON true`;
     }
-    if (!joinStatementsSet.has(sql)) {
-      joinStatementsSet.add(sql);
-      ctx.sql.push(sql);
+    if (joinSet) {
+      if (joinSet.has(sql))
+        continue;
+      joinSet.add(sql);
     }
+    ctx.sql.push(sql);
   }
 };
 const skipQueryKeysForSubQuery = {
@@ -2929,15 +2932,17 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   let conditions;
   if ((_a = query.join) == null ? void 0 : _a.length) {
     const items = [];
-    joinStatementsSet.clear();
+    const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
     for (const item of query.join) {
       if (!Array.isArray(item)) {
         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 (joinSet) {
+          if (joinSet.has(key))
+            continue;
+          joinSet.add(key);
         }
+        items.push(join);
       }
     }
     if (items.length) {