pqb 0.52.1 → 0.52.2

package/dist/index.mjs

@@ -925,20 +925,33 @@ const getSqlText = (sql) => {
 };
 
 class CustomTypeColumn extends ColumnType {
-  constructor(schema, dataType, extension) {
+  constructor(schema, typeName, typeSchema, extension) {
     super(
       schema,
       schema.unknown(),
       schema.unknown(),
       schema.unknown()
     );
-    this.dataType = dataType;
+    this.typeName = typeName;
+    this.typeSchema = typeSchema;
     this.operators = Operators.any;
+    this.dataType = typeSchema ? typeSchema + "." + typeName : typeName;
     this.data.isOfCustomType = true;
     this.data.extension = extension;
   }
   toCode(ctx, key) {
-    return columnCode(this, ctx, key, `type(${singleQuote(this.dataType)})`);
+    const {
+      dataType,
+      data: { typmod }
+    } = this;
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `type(${singleQuote(
+        (dataType.startsWith(ctx.currentSchema) ? dataType.slice(ctx.currentSchema.length + 1) : dataType) + (typmod !== void 0 && typmod !== -1 && !dataType.includes("(") ? `(${typmod})` : "")
+      )})`
+    );
   }
   as(column) {
     const c = setColumnData(
@@ -2762,7 +2775,7 @@ const _joinLateralProcessArg = (q, arg, cb) => {
   }
   return result;
 };
-const _joinLateral = (self, type, arg, as) => {
+const _joinLateral = (self, type, arg, as, innerJoinLateral) => {
   const q = self;
   arg.q.joinTo = q;
   const joinedAs = getQueryAs(q);
@@ -2783,7 +2796,10 @@ const _joinLateral = (self, type, arg, as) => {
   }
   as || (as = getQueryAs(arg));
   setObjectValueImmutable(q.q, "joinedComputeds", as, arg.q.computeds);
-  pushQueryValueImmutable(q, "join", [type, arg, as]);
+  pushQueryValueImmutable(q, "join", {
+    type: `${type} LATERAL`,
+    args: { l: arg, a: as, i: innerJoinLateral }
+  });
   return q;
 };
 
@@ -4235,10 +4251,12 @@ const processSelectArg = (q, as, arg, columnAs) => {
         joinQuery = true;
         value = value.joinQuery(value, q);
         let query;
-        const returnType = value.q.returnType;
+        const { returnType, innerJoinLateral } = value.q;
         if (!returnType || returnType === "all") {
           query = value.json(false);
-          value.q.coalesceValue = emptyArrSQL;
+          if (!innerJoinLateral) {
+            value.q.coalesceValue = emptyArrSQL;
+          }
         } else if (returnType === "pluck") {
           query = value.q.select ? value.wrap(cloneQueryBaseUnscoped(value)).jsonAgg(value.q.select[0]) : value.json(false);
           value.q.coalesceValue = emptyArrSQL;
@@ -4265,9 +4283,12 @@ const processSelectArg = (q, as, arg, columnAs) => {
         }
         _joinLateral(
           q,
-          value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
+          innerJoinLateral ? "JOIN" : "LEFT JOIN",
           query,
-          key
+          key,
+          // no need for `ON p.r IS NOT NULL` check when joining a single record,
+          // `JOIN` will handle it on itself.
+          innerJoinLateral && returnType !== "one" && returnType !== "oneOrThrow"
         );
       }
     }
@@ -6034,7 +6055,13 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
-  if ("j" in args) {
+  if ("l" in args) {
+    const { aliasValue } = ctx;
+    ctx.aliasValue = true;
+    target = `(${getSqlText(args.l.toSQL(ctx))}) "${query.aliases?.[args.a] || args.a}"`;
+    on = `${args.i ? `"${args.a}".r IS NOT NULL` : "true"}`;
+    ctx.aliasValue = aliasValue;
+  } else if ("j" in args) {
     const { j, s, r } = args;
     const tableName = typeof j.q.from === "string" ? j.q.from : j.table;
     const quotedTable = quoteSchemaAndTable(j.q.schema, tableName);
@@ -6204,24 +6231,14 @@ const getObjectOrRawConditions = (ctx, query, data, quotedAs, joinAs, joinShape)
 const pushJoinSql = (ctx, table, query, quotedAs) => {
   const joinSet = query.join.length > 1 ? /* @__PURE__ */ new Set() : null;
   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];
-      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${query.aliases?.[as] || as}" ON true`;
-      ctx.aliasValue = aliasValue;
-    } else {
-      const { target, on = "true" } = processJoinItem(
-        ctx,
-        table,
-        query,
-        item.args,
-        quotedAs
-      );
-      sql = `${item.type} ${target} ON ${on}`;
-    }
+    const { target, on = "true" } = processJoinItem(
+      ctx,
+      table,
+      query,
+      item.args,
+      quotedAs
+    );
+    const sql = `${item.type} ${target} ON ${on}`;
     if (joinSet) {
       if (joinSet.has(sql)) continue;
       joinSet.add(sql);