pqb 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Postgres query builder",
   "homepage": "https://porm.netlify.app/guide/query-builder.html",
   "repository": {

package/src/queryMethods/columnInfo.ts

@@ -44,7 +44,7 @@ export class ColumnInfoMethods {
       (this.query as ColumnInfoQueryData).column = column as string;
     }
 
-    this.then = function (resolve, reject) {
+    this.then = function (this: Query, resolve, reject) {
       new Then().then.call(
         this,
         (rows) => {

package/src/queryMethods/join.ts

@@ -177,7 +177,7 @@ const _join = <
 
     const relation = (q.relations as Record<string, Relation>)[joinKey];
     if (relation) {
-      parsers = relation.model.query.parsers || relation.model.columnsParsers;
+      parsers = relation.query.query.parsers || relation.query.columnsParsers;
     } else {
       const shape = q.query.withShapes?.[first as string];
       if (shape) {

package/src/queryMethods/then.ts

@@ -6,8 +6,7 @@ import { CommonQueryData, Sql } from '../sql';
 import { AfterCallback, BeforeCallback } from './callbacks';
 import { getValueKey } from './get';
 
-export type ThenResult<Res> = <T extends Query>(
-  this: T,
+export type ThenResult<Res> = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   resolve?: (value: Res) => any,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/queryMethods/where.test.ts

@@ -1546,14 +1546,14 @@ export const testJoin = (
   describe('relation', () => {
     const withRelation = q as Query & {
       relations: {
-        message: { key: 'message'; model: typeof Message; joinQuery: Query };
+        message: { key: 'message'; query: typeof Message; joinQuery: Query };
       };
     };
 
     withRelation.relations = {
       message: {
         key: 'message',
-        model: Message,
+        query: Message,
         joinQuery: pushQueryOn(Message.clone(), Message, q, 'authorId', 'id'),
       },
     };

package/src/relations.ts

@@ -91,6 +91,7 @@ export type BaseRelation = {
   type: string;
   key: string;
   model: QueryWithTable;
+  query: QueryWithTable;
   joinQuery: Query;
   nestedCreateQuery: Query;
   nestedInsert?: