orchid-orm 1.36.4 → 1.37.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Query, SelectableFromShape, CreateMethodsNames, CreateData, AddQueryDefaults, RelationConfigBase, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationJoinQuery, RelationQuery, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, QueryBase, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, SetQueryReturnsOne, SetQueryReturnsOneOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, Simplify, ColumnShapeOutput, DefaultSelectColumns, ColumnShapeInput, ColumnShapeInputPartial, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, QueryColumn, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, Simplify, ColumnShapeOutput, DefaultSelectColumns, ColumnShapeInput, ColumnShapeInputPartial, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, QueryColumn, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
@@ -40,8 +40,10 @@ type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery e
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : TableQuery[K];
 };
-interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Q extends Query, CD = CreateData<T['relations'][Name]['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, HasOnePopulate<T, Name>>>> extends RelationConfigBase {
+interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query, CD = T['relations'][Name]['options'] extends RelationThroughOptions ? CreateData<Q, CreateBelongsToData<Q>> : CreateData<AddQueryDefaults<Q, HasOnePopulate<T, Name>>, CreateBelongsToData<Q>>> extends RelationConfigBase {
     query: Q;
+    params: HasOneParams<T, Rel>;
+    maybeSingle: T['relations'][Name]['options']['required'] extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
     omitForeignKeyInCreate: never;
     optionalDataForCreate: T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : {
         [P in Name]?: RelationToOneDataForCreate<{
@@ -59,12 +61,12 @@ interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Q extend
     };
     dataForUpdateOne: {
         disconnect: boolean;
+    } | {
+        set: WhereArg<Q>;
     } | {
         delete: boolean;
     } | {
         update: UpdateData<Q>;
-    } | {
-        set: WhereArg<Q>;
     } | {
         upsert: {
             update: UpdateData<Q>;
@@ -79,8 +81,10 @@ interface HasMany extends RelationThunkBase {
     type: 'hasMany';
     options: HasOneOptions;
 }
-interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Q extends Query> extends RelationConfigBase {
+interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasMany, Q extends Query> extends RelationConfigBase {
     query: Q;
+    params: HasOneParams<T, Rel>;
+    maybeSingle: Q;
     omitForeignKeyInCreate: never;
     optionalDataForCreate: {
         [P in Name]?: T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : {
@@ -135,8 +139,10 @@ type BelongsToQuery<T extends Query, Name extends string> = {
         selectable: SelectableFromShape<T['shape'], Name>;
     } : P extends 'join' ? RelJoin : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P];
 };
-interface BelongsToInfo<Name extends string, FK extends string, Required, Q extends Query> extends RelationConfigBase {
+interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo, FK extends string, Required, Q extends Query> extends RelationConfigBase {
     query: Q;
+    params: BelongsToParams<T, Rel>;
+    maybeSingle: Required extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
     omitForeignKeyInCreate: FK;
     dataForCreate: {
         columns: FK;
@@ -156,7 +162,7 @@ interface BelongsToInfo<Name extends string, FK extends string, Required, Q exte
     } | {
         update: UpdateData<Q>;
     } | {
-        create: CreateData<Q>;
+        create: CreateData<Q, CreateBelongsToData<Q>>;
     };
     dataForUpdateOne: {
         disconnect: boolean;
@@ -167,11 +173,11 @@ interface BelongsToInfo<Name extends string, FK extends string, Required, Q exte
     } | {
         update: UpdateData<Q>;
     } | {
-        create: CreateData<Q>;
+        create: CreateData<Q, CreateBelongsToData<Q>>;
     } | {
         upsert: {
             update: UpdateData<Q>;
-            create: CreateData<Q> | (() => CreateData<Q>);
+            create: CreateData<Q, CreateBelongsToData<Q>> | (() => CreateData<Q, CreateBelongsToData<Q>>);
         };
     };
 }
@@ -297,9 +303,10 @@ type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = {
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : TableQuery[K];
 };
-interface HasAndBelongsToManyInfo<Name extends string, Q extends Query> extends RelationConfigBase {
+interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasAndBelongsToMany, Q extends Query> extends RelationConfigBase {
     query: Q;
-    joinQuery: RelationJoinQuery;
+    params: HasAndBelongsToManyParams<T, Rel>;
+    maybeSingle: Q;
     omitForeignKeyInCreate: never;
     optionalDataForCreate: {
         [P in Name]?: {
@@ -386,9 +393,17 @@ interface RelationConfigSelf {
     relations: RelationThunks;
 }
 type RelationConfigParams<T extends RelationConfigSelf, Relation extends RelationThunk> = Relation extends BelongsTo ? BelongsToParams<T, Relation> : Relation extends HasOne | HasMany ? HasOneParams<T, Relation> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyParams<T, Relation> : never;
-type MapRelation<T extends RelationConfigSelf, K extends keyof T['relations'] & string, R extends Query> = T['relations'][K] extends BelongsTo ? RelationQuery<BelongsToInfo<K, T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<R, K>>, BelongsToParams<T, T['relations'][K]>, T['relations'][K]['options']['required'], true> : T['relations'][K] extends HasOne ? RelationQuery<HasOneInfo<T, K, HasOneQuery<T, K, RelationScopeOrTable<T['relations'][K]>>>, HasOneParams<T, T['relations'][K]>, T['relations'][K]['options']['required'], true> : T['relations'][K] extends HasMany ? RelationQuery<HasManyInfo<T, K, HasOneQuery<T, K, RelationScopeOrTable<T['relations'][K]>>>, HasOneParams<T, T['relations'][K]>, true, false> : T['relations'][K] extends HasAndBelongsToMany ? RelationQuery<HasAndBelongsToManyInfo<K, HasAndBelongsToManyQuery<K, RelationScopeOrTable<T['relations'][K]>>>, HasAndBelongsToManyParams<T, T['relations'][K]>, true, false> : never;
+type MapRelation<T extends RelationConfigSelf, K extends keyof T['relations'] & string> = T['relations'][K] extends BelongsTo ? {
+    relationConfig: BelongsToInfo<T, K, T['relations'][K], T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationScopeOrTable<T['relations'][K]>, K>>;
+} : T['relations'][K] extends HasOne ? {
+    relationConfig: HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationScopeOrTable<T['relations'][K]>>>;
+} : T['relations'][K] extends HasMany ? {
+    relationConfig: HasManyInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationScopeOrTable<T['relations'][K]>>>;
+} : T['relations'][K] extends HasAndBelongsToMany ? {
+    relationConfig: HasAndBelongsToManyInfo<T, K, T['relations'][K], HasAndBelongsToManyQuery<K, RelationScopeOrTable<T['relations'][K]>>>;
+} : never;
 type MapRelations<T> = T extends RelationConfigSelf ? {
-    [K in keyof T['relations'] & string]: MapRelation<T, K, RelationScopeOrTable<T['relations'][K]>>;
+    [K in keyof T['relations'] & string]: MapRelation<T, K>;
 } : EmptyObject;
 
 interface TableClass<T extends ORMTableInput = ORMTableInput> {
@@ -407,9 +422,11 @@ interface TableInfo {
 interface Table extends Query, TableInfo {
 }
 interface TableToDb<T extends ORMTableInput, Relations extends RelationsBase> extends TableInfo, Db<T['table'], T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T>> {
-    relations: Relations;
+    relations: {
+        [K in keyof Relations]: Relations[K]['relationConfig']['query'] & Relations[K];
+    };
 }
-type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, MapRelations<T>> & MapRelations<T> : TableToDb<T, EmptyObject>;
+type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, MapRelations<T>> : TableToDb<T, EmptyObject>;
 type ScopeFn<Related extends TableClass, Scope extends Query> = (q: ORMTableInputToQueryBuilder<InstanceType<Related>>) => Scope;
 interface ORMTableInput {
     table: string;
@@ -461,7 +478,7 @@ interface BaseTableInstance<ColumnTypes> {
     language?: string;
     filePath: string;
     result: ColumnsShapeBase;
-    clone<T extends QueryBase>(this: T): T;
+    clone<T extends IsQuery>(this: T): T;
     getFilePath(): string;
     setColumns<Shape extends ColumnsShapeBase, Data extends MaybeArray<TableDataItem>>(fn: (t: ColumnTypes) => Shape, tableData?: TableDataFn<Shape, Data>): SetColumnsResult<Shape, Data>;
     /**

package/dist/index.js

@@ -341,11 +341,16 @@ const makeBelongsToMethod = (relation, relationName, query) => {
     return q;
   };
   const reverseJoin = (baseQuery, joiningQuery) => {
-    return join(joiningQuery, baseQuery, foreignKeys, primaryKeys);
+    return join(
+      joiningQuery,
+      baseQuery,
+      foreignKeys,
+      primaryKeys
+    );
   };
   return {
     returns: "one",
-    method(params) {
+    queryRelated(params) {
       return query.where(makeWhere(params));
     },
     virtualColumn: new BelongsToVirtualColumn(
@@ -552,19 +557,19 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
   };
 };
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
@@ -607,7 +612,10 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
     const sourceRelation = getSourceRelation(throughRelation, source);
-    const sourceQuery = sourceRelation.joinQuery(sourceRelation.query, throughRelation.query).as(relationName);
+    const sourceQuery = sourceRelation.joinQuery(
+      sourceRelation.query,
+      throughRelation.query
+    ).as(relationName);
     const whereExistsCallback = () => sourceQuery;
     const reverseJoin2 = (baseQuery, joiningQuery) => {
       return joinHasThrough(
@@ -620,8 +628,8 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
     };
     return {
       returns: "one",
-      method: (params) => {
-        const throughQuery = table[through](params);
+      queryRelated: (params) => {
+        const throughQuery = table.queryRelated(through, params);
         return query.whereExists(throughQuery, whereExistsCallback);
       },
       joinQuery: joinQueryChainingHOF(
@@ -657,7 +665,7 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
   };
   return {
     returns: "one",
-    method: (params) => {
+    queryRelated: (params) => {
       const values = {};
       for (let i = 0; i < len; i++) {
         values[foreignKeys[i]] = params[primaryKeys[i]];
@@ -671,7 +679,13 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
     ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
-      (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
+      (joiningQuery, baseQuery) => joinHasRelation(
+        baseQuery,
+        joiningQuery,
+        primaryKeys,
+        foreignKeys,
+        len
+      )
     ),
     reverseJoin,
     modifyRelatedQuery(relationQuery) {
@@ -730,7 +744,7 @@ const nestedInsert$2 = ({ query, primaryKeys, foreignKeys }) => {
     if (items.length) {
       for (let i = 0, len = items.length; i < len; i++) {
         const [selfData, item] = items[i];
-        const data2 = __spreadValues$5({}, "create" in item ? item.create : item.connectOrCreate.create);
+        const data2 = __spreadValues$4({}, "create" in item ? item.create : item.connectOrCreate.create);
         for (let i2 = 0; i2 < primaryKeys.length; i2++) {
           data2[foreignKeys[i2]] = selfData[primaryKeys[i2]];
         }
@@ -759,7 +773,7 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
       await pqb._queryUpdate(currentRelationsQuery, setNulls);
       const record = data[0];
       if (params.create) {
-        const obj = __spreadValues$5({}, params.create);
+        const obj = __spreadValues$4({}, params.create);
         for (let i = 0; i < len; i++) {
           obj[foreignKeys[i]] = record[primaryKeys[i]];
         }
@@ -793,7 +807,7 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
             if (!updatedIds.some(
               (updated) => updated.every((value, i) => value === ids2[i])
             )) {
-              const obj = __spreadValues$5({}, data2);
+              const obj = __spreadValues$4({}, data2);
               for (let i = 0; i < len; i++) {
                 obj[foreignKeys[i]] = ids2[i];
               }
@@ -807,19 +821,19 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
   };
 };
 
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$3 = Object.defineProperty;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
@@ -862,7 +876,9 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
     const sourceRelation = getSourceRelation(throughRelation, source);
-    const sourceRelationQuery = sourceRelation.query.as(relationName);
+    const sourceRelationQuery = sourceRelation.query.as(
+      relationName
+    );
     const sourceQuery = sourceRelation.joinQuery(
       sourceRelationQuery,
       throughRelation.query
@@ -879,9 +895,12 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
     };
     return {
       returns: "many",
-      method: (params) => {
-        const throughQuery = table[through](params);
-        return query.whereExists(throughQuery, whereExistsCallback);
+      queryRelated: (params) => {
+        const throughQuery = table.queryRelated(through, params);
+        return query.whereExists(
+          throughQuery,
+          whereExistsCallback
+        );
       },
       joinQuery: joinQueryChainingHOF(
         reverseJoin2,
@@ -916,7 +935,7 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
   };
   return {
     returns: "many",
-    method: (params) => {
+    queryRelated: (params) => {
       const values = {};
       for (let i = 0; i < len; i++) {
         values[foreignKeys[i]] = params[primaryKeys[i]];
@@ -930,7 +949,13 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
     ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
-      (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
+      (joiningQuery, baseQuery) => joinHasRelation(
+        baseQuery,
+        joiningQuery,
+        primaryKeys,
+        foreignKeys,
+        len
+      )
     ),
     reverseJoin,
     modifyRelatedQuery(relationQuery) {
@@ -1031,13 +1056,13 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
         }
         if (create) {
           for (const item of create) {
-            records.push(__spreadValues$4(__spreadValues$4({}, item), obj));
+            records.push(__spreadValues$3(__spreadValues$3({}, item), obj));
           }
         }
         if (connectOrCreate) {
           for (const item of connectOrCreate) {
             if (connected[connectedI++] === 0) {
-              records.push(__spreadValues$4(__spreadValues$4({}, item.create), obj));
+              records.push(__spreadValues$3(__spreadValues$3({}, item.create), obj));
             }
           }
         }
@@ -1057,7 +1082,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
         obj[foreignKeys[i]] = data[0][primaryKeys[i]];
       }
       await t.insertMany(
-        params.create.map((create) => __spreadValues$4(__spreadValues$4({}, create), obj))
+        params.create.map((create) => __spreadValues$3(__spreadValues$3({}, create), obj))
       );
       delete t.q[pqb.toSQLCacheKey];
     }
@@ -1110,25 +1135,25 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
   };
 };
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$2 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
   constructor(joinTable, schema, key, state) {
     super(schema);
@@ -1163,7 +1188,7 @@ const removeColumnName = (column) => {
   if (!column.data.name)
     return column;
   const cloned = Object.create(column);
-  cloned.data = __spreadProps$2(__spreadValues$3({}, column.data), { name: void 0 });
+  cloned.data = __spreadProps$1(__spreadValues$2({}, column.data), { name: void 0 });
   return cloned;
 };
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
@@ -1205,7 +1230,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     );
   }
   baseQuery.shape = shape;
-  baseQuery.q = __spreadProps$2(__spreadValues$3({}, baseQuery.q), {
+  baseQuery.q = __spreadProps$1(__spreadValues$2({}, baseQuery.q), {
     shape: baseQuery.shape
   });
   const subQuery = Object.create(baseQuery);
@@ -1245,13 +1270,18 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   const selectPrimaryKeysAsForeignKeys = [{ selectAs: obj }];
   const reverseJoin = (baseQuery2, joiningQuery) => {
     const foreignAs = pqb.getQueryAs(joiningQuery);
-    return joinQuery(baseQuery2, pqb.getQueryAs(baseQuery2), foreignAs, __spreadProps$2(__spreadValues$3({}, baseQuery2.q.joinedShapes), {
-      [foreignAs]: joiningQuery.q.shape
-    }));
+    return joinQuery(
+      baseQuery2,
+      pqb.getQueryAs(baseQuery2),
+      foreignAs,
+      __spreadProps$1(__spreadValues$2({}, baseQuery2.q.joinedShapes), {
+        [foreignAs]: joiningQuery.q.shape
+      })
+    );
   };
   return {
     returns: "many",
-    method(params) {
+    queryRelated(params) {
       return query.whereExists(subQuery, (q) => {
         q = q.clone();
         const where = {};
@@ -1275,35 +1305,44 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
-      (joiningQuery, baseQuery2) => joinQuery(joiningQuery, pqb.getQueryAs(baseQuery2), pqb.getQueryAs(joiningQuery), __spreadProps$2(__spreadValues$3({}, joiningQuery.q.joinedShapes), {
-        [baseQuery2.q.as || baseQuery2.table]: baseQuery2.q.shape
-      }))
+      (joiningQuery, baseQuery2) => joinQuery(
+        joiningQuery,
+        pqb.getQueryAs(baseQuery2),
+        pqb.getQueryAs(joiningQuery),
+        __spreadProps$1(__spreadValues$2({}, joiningQuery.q.joinedShapes), {
+          [baseQuery2.q.as || baseQuery2.table]: baseQuery2.q.shape
+        })
+      )
     ),
     reverseJoin,
     modifyRelatedQuery(relationQuery) {
       const ref = {};
-      pqb._queryHookAfterCreate(relationQuery, [], async (result) => {
-        if (result.length > 1) {
-          throw new pqb.OrchidOrmInternalError(
-            relationQuery,
-            "Creating multiple `hasAndBelongsToMany` records is not yet supported"
+      pqb._queryHookAfterCreate(
+        relationQuery,
+        [],
+        async (result) => {
+          if (result.length > 1) {
+            throw new pqb.OrchidOrmInternalError(
+              relationQuery,
+              "Creating multiple `hasAndBelongsToMany` records is not yet supported"
+            );
+          }
+          const baseQuery2 = ref.q.clone();
+          baseQuery2.q.select = selectPrimaryKeysAsForeignKeys;
+          const data = {};
+          for (let i = 0; i < throughLen; i++) {
+            data[throughForeignKeys[i]] = result[0][throughPrimaryKeys[i]];
+          }
+          const createdCount = await pqb._queryCreateFrom(
+            subQuery.count(),
+            baseQuery2,
+            data
           );
+          if (createdCount === 0) {
+            throw new pqb.NotFoundError(baseQuery2);
+          }
         }
-        const baseQuery2 = ref.q.clone();
-        baseQuery2.q.select = selectPrimaryKeysAsForeignKeys;
-        const data = {};
-        for (let i = 0; i < throughLen; i++) {
-          data[throughForeignKeys[i]] = result[0][throughPrimaryKeys[i]];
-        }
-        const createdCount = await pqb._queryCreateFrom(
-          subQuery.count(),
-          baseQuery2,
-          data
-        );
-        if (createdCount === 0) {
-          throw new pqb.NotFoundError(baseQuery2);
-        }
-      });
+      );
       return (q) => {
         ref.q = q;
       };
@@ -1343,7 +1382,7 @@ const insertToJoinTable = (state, joinTableTransaction, data, idsRows) => {
       obj[state.foreignKeys[i]] = item[state.primaryKeys[i]];
     }
     for (const ids of idsRows) {
-      const record = __spreadValues$3({}, obj);
+      const record = __spreadValues$2({}, obj);
       for (let i = 0; i < throughLen; i++) {
         record[state.throughForeignKeys[i]] = ids[i];
       }
@@ -1486,7 +1525,7 @@ const nestedInsert = ({
         obj[foreignKeys[i]] = selfData[primaryKeys[i]];
       }
       for (const relationData of relationKeys) {
-        const record = __spreadValues$3({}, obj);
+        const record = __spreadValues$2({}, obj);
         for (let i = 0; i < throughLen; i++) {
           record[throughForeignKeys[i]] = relationData[throughPrimaryKeys[i]];
         }
@@ -1512,7 +1551,7 @@ const nestedUpdate = (state) => {
           obj[state.foreignKeys[i]] = item[state.primaryKeys[i]];
         }
         for (const ids of idsRows) {
-          const record = __spreadValues$3({}, obj);
+          const record = __spreadValues$2({}, obj);
           for (let i = 0; i < throughLen; i++) {
             record[state.throughForeignKeys[i]] = ids[i];
           }
@@ -1585,25 +1624,6 @@ const nestedUpdate = (state) => {
   };
 };
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 const applyRelations = (qb, tables, result) => {
   var _a;
   const tableEntries = Object.entries(tables);
@@ -1733,7 +1753,6 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   if (data.virtualColumn) {
     dbTable.shape[relationName] = dbTable.q.shape[relationName] = data.virtualColumn;
   }
-  makeRelationQuery(dbTable, relationName, data, query);
   baseQuery.joinQuery = data.joinQuery;
   const { join: originalJoin } = baseQuery;
   baseQuery.join = function(...args) {
@@ -1748,7 +1767,10 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   baseQuery.relationConfig = {
     table: otherDbTable,
     query,
-    joinQuery: data.joinQuery
+    queryRelated: data.queryRelated,
+    joinQuery: data.joinQuery,
+    reverseJoin: data.reverseJoin,
+    modifyRelatedQuery: data.modifyRelatedQuery
   };
   dbTable.relations[relationName] = query;
   const tableRelations = delayedRelations.get(dbTable);
@@ -1758,54 +1780,6 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     applyRelation(qb, data2, delayedRelations);
   });
 };
-const makeRelationQuery = (table, relationName, data, q) => {
-  Object.defineProperty(table, relationName, {
-    configurable: true,
-    get() {
-      var _a;
-      const toTable = q.clone();
-      let query;
-      if (this.q.subQuery) {
-        query = toTable;
-        query.q.subQuery = 2;
-      } else {
-        query = pqb._queryWhere(pqb._queryAll(toTable), [
-          {
-            EXISTS: { q: data.reverseJoin(this, toTable) }
-          }
-        ]);
-      }
-      if (this.q.relChain) {
-        query.q.relChain = [...this.q.relChain, this];
-        query.q.returnType = "all";
-      } else {
-        query.q.relChain = [this];
-      }
-      const aliases = this.q.as ? __spreadValues$2({}, this.q.aliases) : __spreadProps$1(__spreadValues$2({}, this.q.aliases), { [this.table]: this.table });
-      const relAliases = query.q.aliases;
-      for (const as in relAliases) {
-        aliases[as] = pqb._queryResolveAlias(aliases, as);
-      }
-      query.q.as = aliases[query.q.as];
-      query.q.aliases = aliases;
-      query.q.joinedShapes = __spreadValues$2({
-        [pqb.getQueryAs(this)]: this.q.shape
-      }, this.q.joinedShapes);
-      const setQuery = (_a = data.modifyRelatedQuery) == null ? void 0 : _a.call(data, query);
-      setQuery == null ? void 0 : setQuery(this);
-      return new Proxy(data.method, {
-        get(_, prop) {
-          return query[prop];
-        }
-      });
-    },
-    set(value) {
-      Object.defineProperty(this, relationName, {
-        value
-      });
-    }
-  });
-};
 
 function transaction(fnOrOptions, fn) {
   return this.$queryBuilder.transaction(