pqb 0.52.2 → 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)),
         ","
       ])
@@ -2144,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(", ")} }`;
@@ -2656,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;
@@ -2746,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) {
@@ -2768,7 +2768,7 @@ const _joinLateralProcessArg = (q, arg, cb) => {
     cb
   );
   if (relation) {
-    result = relation.relationConfig.joinQuery(
+    result = relation.joinQuery(
       result,
       q
     );
@@ -3573,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) {
@@ -6276,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](
@@ -6376,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;
 };
@@ -7196,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;
@@ -7235,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);
@@ -7255,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;
@@ -12673,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);
   }
 }
@@ -12837,6 +12834,7 @@ class Db extends QueryMethods {
     };
     this.baseQuery = this;
     this.relations = {};
+    this.relationQueries = {};
     const logger = options.logger || console;
     const parsers = {};
     let hasParsers = false;