pqb 0.52.1 → 0.52.3

package/dist/index.mjs

@@ -493,7 +493,7 @@ const columnsShapeToCode = (ctx, shape) => {
     if (name === key) column.data.name = void 0;
     code.push(
       ...combineCodeElements([
-        `${quoteObjectKey(key)}: `,
+        `${quoteObjectKey(key, ctx.snakeCase)}: `,
         ...toArray(shape[key].toCode(ctx, key)),
         ","
       ])
@@ -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(
@@ -2131,7 +2144,7 @@ class TsVectorColumn extends ColumnType {
         const pairs = [];
         for (const key in target) {
           pairs.push(
-            `${quoteObjectKey(key)}: '${target[key]}'`
+            `${quoteObjectKey(key, false)}: '${target[key]}'`
           );
         }
         code += `{ ${pairs.join(", ")} }`;
@@ -2643,8 +2656,8 @@ const _join = (query, require, type, first, args) => {
     joinKey = first;
     const relation = query.relations[joinKey];
     if (relation) {
-      shape = getShapeFromSelect(relation.relationConfig.query);
-      const r = relation.relationConfig.query;
+      shape = getShapeFromSelect(relation.query);
+      const r = relation.query;
       parsers = r.q.parsers;
       batchParsers = r.q.batchParsers;
       computeds = r.q.computeds;
@@ -2733,7 +2746,7 @@ const _joinLateralProcessArg = (q, arg, cb) => {
   if (typeof arg === "string") {
     relation = q.relations[arg];
     if (relation) {
-      arg = _clone(relation.relationConfig.query);
+      arg = _clone(relation.query);
     } else {
       const w = q.q.withShapes?.[arg];
       if (w) {
@@ -2755,14 +2768,14 @@ const _joinLateralProcessArg = (q, arg, cb) => {
     cb
   );
   if (relation) {
-    result = relation.relationConfig.joinQuery(
+    result = relation.joinQuery(
       result,
       q
     );
   }
   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;
 };
 
@@ -3557,7 +3573,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     if (query.transform) {
       result = applyTransforms(query, returnType, query.transform, result);
     }
-    return resolve?.(result);
+    return resolve ? resolve(result) : result;
   } catch (err) {
     let error;
     if (err instanceof pg.DatabaseError) {
@@ -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);
@@ -6259,7 +6276,7 @@ const getIsJoinSubQuery = (query) => {
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   if (typeof first === "string") {
     if (first in joinTo.relations) {
-      const { query: toQuery, joinQuery } = joinTo.relations[first].relationConfig;
+      const { query: toQuery, joinQuery } = joinTo.relations[first];
       const j = joinQuery(toQuery, joinTo);
       if (typeof args[0] === "function") {
         const r = args[0](
@@ -6359,7 +6376,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
 };
 const preprocessJoinArg = (q, arg) => {
   if (typeof arg !== "function") return arg;
-  arg = arg(q.relations);
+  arg = arg(
+    q.relationQueries
+  );
   arg.joinQueryAfterCallback = arg.joinQuery;
   return arg;
 };
@@ -7179,9 +7198,9 @@ const _chain = (fromQuery, toQuery, rel) => {
     q.returnType = q.returnsOne = q.limit = void 0;
   }
   if (self.q.relChain) {
-    q.relChain = [...self.q.relChain, self];
+    q.relChain = [...self.q.relChain, { query: self, rel }];
   } else {
-    q.relChain = [self];
+    q.relChain = [{ query: self, rel }];
   }
   const aliases = self.q.as ? { ...self.q.aliases } : { ...self.q.aliases, [self.table]: self.table };
   const relAliases = q.aliases;
@@ -7218,7 +7237,7 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
       for (const key in relations) {
         Object.defineProperty(base, key, {
           get() {
-            const rel = relations[key].relationConfig;
+            const rel = relations[key];
             const relQuery = _clone(rel.query);
             relQuery.q.withShapes = this.q.withShapes;
             return _chain(this, relQuery, rel);
@@ -7238,11 +7257,8 @@ const resolveSubQueryCallbackV2 = (q, cb) => {
   return cb(arg);
 };
 const joinSubQuery = (q, sub) => {
-  if (!("relationConfig" in sub)) return sub;
-  return sub.relationConfig.joinQuery(
-    sub,
-    q
-  );
+  if (!("joinQuery" in sub)) return sub;
+  return sub.joinQuery(sub, q);
 };
 
 const defaultSrid = 4326;
@@ -12656,12 +12672,10 @@ class QueryMethods {
     return condition ? fn(this) : this;
   }
   queryRelated(relName, params) {
-    return this.relations[relName].relationConfig.queryRelated(
-      params
-    );
+    return this.relations[relName].queryRelated(params);
   }
   chain(relName) {
-    const rel = this.relations[relName].relationConfig;
+    const rel = this.relations[relName];
     return _chain(this, _clone(rel.query), rel);
   }
 }
@@ -12820,6 +12834,7 @@ class Db extends QueryMethods {
     };
     this.baseQuery = this;
     this.relations = {};
+    this.relationQueries = {};
     const logger = options.logger || console;
     const parsers = {};
     let hasParsers = false;