pqb 0.24.0 → 0.25.0

package/dist/index.js

@@ -877,10 +877,10 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     qb.q = getClonedQueryData(query);
     qb.q.and = qb.q.or = void 0;
     qb.q.isSubQuery = true;
-    const res = data(qb);
+    const res = resolveSubQueryCallback(qb, data);
     const expr = res instanceof orchidCore.Expression ? res : res.q.expr;
     if (!(res instanceof orchidCore.Expression) && res.q.expr) {
-      const q = "relationConfig" in res ? res.relationConfig.joinQuery(res, table) : res.clone();
+      const q = joinSubQuery(table, res);
       q.q.select = [expr];
       ands.push(`(${makeSQL(q, ctx).text})`);
     } else {
@@ -1454,7 +1454,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
   const query = arg;
   query.q.joinTo = q;
   ((_c = (_b = query.q).joinedShapes) != null ? _c : _b.joinedShapes = {})[getQueryAs(q)] = q.q.shape;
-  let result = cb(query);
+  let result = resolveSubQueryCallback(query, cb);
   if (relation) {
     result = relation.relationConfig.joinQuery(
       result,
@@ -1985,7 +1985,7 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
   }
 };
 const maybeUnNameColumn = (column, isSubQuery) => {
-  return isSubQuery && column.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+  return isSubQuery && (column == null ? void 0 : column.data.name) ? orchidCore.setColumnData(column, "name", void 0) : column;
 };
 function _querySelect(q, args) {
   if (!args.length) {
@@ -10696,7 +10696,7 @@ class Db {
     }
   }
   [node_util.inspect.custom]() {
-    return `QueryObject<${this.table}>`;
+    return `Query<${this.table}>`;
   }
   /**
    * Use `query` to perform raw SQL queries.