orchid-orm 1.77.0 → 1.77.1

package/dist/bun.d.ts

@@ -1,24 +1,13 @@
-import * as _$pqb_internal0 from "pqb/internal";
-import { DbSharedOptions, EmptyObject } from "pqb/internal";
-import * as _$pqb_bun0 from "pqb/bun";
-import { BunAdapterOptions, bunSchemaConfig } from "pqb/bun";
 import { OrchidORM, OrchidORMBundle, OrchidOrmParam, OrmTableThunks } from "orchid-orm";
+import { BunAdapterOptions, bunSchemaConfig, createDb as createDb$1 } from "pqb/bun";
+import { DbSharedOptions, EmptyObject } from "pqb/internal";
 interface BunOrchidORMOptions extends BunAdapterOptions, DbSharedOptions {
   views?: OrmTableThunks;
 }
-declare const Adapter: _$pqb_internal0.DriverAdapter;
-declare const createDb: <SchemaConfig extends _$pqb_internal0.ColumnSchemaConfig = _$pqb_internal0.DefaultSchemaConfig, ColumnTypes = _$pqb_internal0.DefaultColumnTypes<SchemaConfig>>({
-  log,
-  ...options
-}: _$pqb_bun0.CreateBunDbOptions<SchemaConfig, ColumnTypes>) => _$pqb_internal0.DbResult<ColumnTypes>;
-declare const makeOrchidOrmDb: <T extends OrmTableThunks, V extends OrmTableThunks = EmptyObject>(orm: OrchidORMBundle<T, V>, {
-  log,
-  ...options
-}: OrchidOrmParam<BunOrchidORMOptions>) => OrchidORM<T, V>;
-declare const orchidORM: <T extends OrmTableThunks, V extends OrmTableThunks = EmptyObject>({
-  views,
-  ...options
-}: OrchidOrmParam<BunOrchidORMOptions & {
+declare const Adapter: import("pqb/internal").DriverAdapter;
+declare const createDb: typeof createDb$1;
+declare const makeOrchidOrmDb: <T extends OrmTableThunks, V extends OrmTableThunks = EmptyObject>(orm: OrchidORMBundle<T, V>, { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>) => OrchidORM<T, V>;
+declare const orchidORM: <T extends OrmTableThunks, V extends OrmTableThunks = EmptyObject>({ views, ...options }: OrchidOrmParam<BunOrchidORMOptions & {
   views?: V;
 }>, tables: T) => OrchidORM<T, V>;
 export { Adapter, BunOrchidORMOptions, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };

package/dist/bun.js

@@ -15,10 +15,11 @@ const makeOrchidOrmDb = (orm, { log, ...options }) => {
 	});
 };
 const orchidORM = ({ views, ...options }, tables) => {
-	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORM)({
+	const orm = (0, orchid_orm.bundleOrchidORM)({
 		tables,
 		views
-	}), options);
+	});
+	return makeOrchidOrmDb(orm, options);
 };
 exports.Adapter = Adapter;
 Object.defineProperty(exports, "bunSchemaConfig", {

package/dist/bun.js.map

@@ -1 +1 @@
-{"version":3,"file":"bun.js","names":["BunAdapter","cdb","AdapterClass"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  OrmTableThunks,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: OrmTableThunks;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAiBA,MAAa,UAAUA,QAAAA;AAEvB,MAAa,WAAWC,QAAAA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;AACpB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,QAAAA;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;AAEpB,QAAO,iBAAA,GAAA,WAAA,iBADqB;EAAE;EAAQ;EAAO,CAAC,EAClB,QAAQ"}
+{"version":3,"file":"bun.js","names":["BunAdapter","cdb","makeOrchidOrmDbWithAdapter","AdapterClass","bundleOrchidORM"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  OrmTableThunks,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: OrmTableThunks;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAiBA,MAAa,UAAUA,QAAAA;AAEvB,MAAa,WAAWC,QAAAA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;CACpB,QAAA,GAAOC,WAAAA,2BAAAA,CAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeH,QAAAA;GACf,QAAQ;EACV,CAAC;CACH,CAAC;AACH;AAEA,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;CACpB,MAAM,OAAA,GAAMI,WAAAA,gBAAAA,CAAgB;EAAE;EAAQ;CAAM,CAAC;CAC7C,OAAO,gBAAgB,KAAK,OAAO;AACrC"}

package/dist/bun.mjs

@@ -14,10 +14,11 @@ const makeOrchidOrmDb = (orm, { log, ...options }) => {
 	});
 };
 const orchidORM = ({ views, ...options }, tables) => {
-	return makeOrchidOrmDb(bundleOrchidORM({
+	const orm = bundleOrchidORM({
 		tables,
 		views
-	}), options);
+	});
+	return makeOrchidOrmDb(orm, options);
 };
 export { Adapter, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };
 

package/dist/bun.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bun.mjs","names":["cdb"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  OrmTableThunks,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: OrmTableThunks;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAiBA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;AACpB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;AAEpB,QAAO,gBADK,gBAAgB;EAAE;EAAQ;EAAO,CAAC,EAClB,QAAQ"}
+{"version":3,"file":"bun.mjs","names":["cdb"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  OrmTableThunks,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: OrmTableThunks;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends OrmTableThunks,\n  V extends OrmTableThunks = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAiBA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;CACpB,OAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;EACV,CAAC;CACH,CAAC;AACH;AAEA,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;CACpB,MAAM,MAAM,gBAAgB;EAAE;EAAQ;CAAM,CAAC;CAC7C,OAAO,gBAAgB,KAAK,OAAO;AACrC"}

package/dist/index.d.ts

@@ -12,7 +12,7 @@ interface BelongsToOptions<Columns extends Column.Shape.QueryInit = Column.Shape
   foreignKey?: boolean | TableData.References.Options;
   on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
 }
-type BelongsToParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type'] };
+type BelongsToParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type']; };
 type BelongsToDefaultRequired<T extends RelationConfigSelf, Rel extends BelongsTo$1, Related> = Related extends {
   softDelete: true;
 } ? false : BelongsToDefaultRequiredFromColumns<T, Rel>;
@@ -22,10 +22,10 @@ type BelongsToColumnRequired<Column> = Column extends {
     isNullable: true;
   };
 } ? false : true;
-type BelongsToQuery<T extends Query, Name extends string> = { [P in keyof T]: P extends '__selectable' ? SelectableFromShape<T['shape'], Name> : P extends '__as' ? Name : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P] } & QueryHasWhere;
+type BelongsToQuery<T extends Query, Name extends string> = { [P in keyof T]: P extends '__selectable' ? SelectableFromShape<T['shape'], Name> : P extends '__as' ? Name : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P]; } & QueryHasWhere;
 interface BelongsToDataForCreate<Name extends string, FK extends string, Required, Q extends Query> {
   columns: FK;
-  nested: Q extends Query.Pick.IsNotReadOnly ? Required extends true ? { [Key in Name]: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: never };
+  nested: Q extends Query.Pick.IsNotReadOnly ? Required extends true ? { [Key in Name]: RelationToOneDataForCreateSameQuery<Q>; } : { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q>; } : { [Key in Name]?: never; };
 }
 interface BelongsToInfo<T extends RelationConfigSelf, FK extends string, Required, Q extends Query> extends RelationConfigBase {
   returnsOne: true;
@@ -77,7 +77,7 @@ interface HasMany$1 extends RelationThunkBase {
   type: 'hasMany';
   options: HasOneOptions;
 }
-type HasManyQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions$1 ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K] } & QueryHasWhere : HasOneQueryThrough<Name, TableQuery>;
+type HasManyQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions$1 ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true; } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K]; } & QueryHasWhere : HasOneQueryThrough<Name, TableQuery>;
 interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasMany$1, Q extends Query> extends RelationConfigBase {
   returnsOne: false;
   query: Q;
@@ -90,7 +90,7 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel ext
       where: WhereArg<Q>;
       create: CreateData<Q>;
     }[];
-  } : never };
+  } : never; };
   dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
     disconnect?: MaybeArray<WhereArg<Q>>;
     delete?: MaybeArray<WhereArg<Q>>;
@@ -124,9 +124,9 @@ interface RelationHasOneThroughOptions<Through extends string> extends RelationT
   required?: boolean;
 }
 type HasOneOptions<Columns extends Column.Shape.QueryInit = Column.Shape.QueryInit, Related extends ORMTableInput = ORMTableInput, Through extends string = string> = RelationRefsOptions$1<keyof Columns, Related['columns']['shape']> | RelationHasOneThroughOptions<Through>;
-type HasOneParams<T extends RelationConfigSelf, Options> = Options extends RelationRefsOptions$1 ? { [Name in Options['columns'][number]]: T['columns']['shape'][Name]['__type'] } : Options extends RelationThroughOptions$1 ? RelationConfigParams<T, T['relations'][Options['through']]> : never;
-type HasOneQueryThrough<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateMethodsNames ? never : TableQuery[K] } & QueryHasWhere;
-type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions$1 ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateManyMethodsNames ? never : TableQuery[K] } & QueryHasWhere : HasOneQueryThrough<Name, TableQuery>;
+type HasOneParams<T extends RelationConfigSelf, Options> = Options extends RelationRefsOptions$1 ? { [Name in Options['columns'][number]]: T['columns']['shape'][Name]['__type']; } : Options extends RelationThroughOptions$1 ? RelationConfigParams<T, T['relations'][Options['through']]> : never;
+type HasOneQueryThrough<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateMethodsNames ? never : TableQuery[K]; } & QueryHasWhere;
+type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions$1 ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true; } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateManyMethodsNames ? never : TableQuery[K]; } & QueryHasWhere : HasOneQueryThrough<Name, TableQuery>;
 interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne$1, Q extends Query> extends RelationConfigBase {
   returnsOne: true;
   required: Rel['options']['required'];
@@ -136,7 +136,7 @@ interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel exte
   dataForCreate: { [K in Name]?: Q extends Query.Pick.IsNotReadOnly ? Rel['options'] extends RelationThroughOptions$1 ? EmptyObject : RelationToOneDataForCreate<{
     nestedCreateQuery: CreateData<Q>;
     table: Q;
-  }> : never };
+  }> : never; };
   dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
     disconnect: boolean;
   } | {
@@ -180,8 +180,8 @@ interface HasAndBelongsToManyOptions$1<Columns extends Column.Shape.QueryInit =
   };
   on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
 }
-type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type'] };
-type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K] } & QueryHasWhere;
+type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type']; };
+type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K]; } & QueryHasWhere;
 interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Q extends Query> extends RelationConfigBase {
   returnsOne: false;
   query: Q;
@@ -196,7 +196,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends str
     }[];
   } : {
     connect?: WhereArg<Q>[];
-  } };
+  }; };
   dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
     disconnect?: MaybeArray<WhereArg<Q>>;
     set?: MaybeArray<WhereArg<Q>>;
@@ -348,7 +348,7 @@ declare namespace OrmTable {
     /**
      * Sets column values before a create, update, or save action.
      */
-    set(data: { [K in keyof ColumnsShape.InputPartial<Columns>]?: ColumnsShape.InputPartial<Columns>[K] | (() => QueryOrExpression<ColumnsShape.InputPartial<Columns>[K]>) }): void;
+    set(data: { [K in keyof ColumnsShape.InputPartial<Columns>]?: ColumnsShape.InputPartial<Columns>[K] | (() => QueryOrExpression<ColumnsShape.InputPartial<Columns>[K]>); }): void;
   }
   export interface InitHooks<Columns extends ColumnsShape> {
     /**
@@ -598,7 +598,7 @@ declare namespace OrmTable {
   }
   export namespace Relations {
     type Resolve<Relations> = Relations extends ((...args: never[]) => infer Result) ? ResolveMany<Result> : Relations;
-    type ResolveMany<Relations> = { [K in keyof Relations]: ResolveOne<Relations[K]> };
+    type ResolveMany<Relations> = { [K in keyof Relations]: ResolveOne<Relations[K]>; };
     type ResolveOne<Relation> = Relation extends BelongsTo<infer C, infer Fn, infer Required> ? ResolvedBelongsTo<TargetId<Fn>, C, TargetReferences<Fn>, Required> : Relation extends HasOne<infer C, infer Fn, infer Required> ? ResolvedHasOne<TargetId<Fn>, C, TargetReferences<Fn>, Required> : Relation extends HasMany<infer C, infer Fn> ? ResolvedHasMany<TargetId<Fn>, C, TargetReferences<Fn>> : Relation extends HasAndBelongsToMany<infer C, infer Fn, infer Options> ? ResolveHasAndBelongsToMany<C, Fn, Options> : Relation extends HasOneThrough<infer Fn, infer Required> ? ResolvedHasOneThrough<TargetId<Fn>, ResolveHasOneThroughOptions<RelationThroughOptions<TargetThrough<Fn>>, Required>> : Relation extends HasManyThrough<infer Fn> ? ResolvedHasManyThrough<TargetId<Fn>, RelationThroughOptions<TargetThrough<Fn>>> : Relation;
     type ResolveHasAndBelongsToMany<C extends string[], Fn extends Function, Options, References extends string[] = TargetReferences<Fn>> = ResolvedHasAndBelongsToMany<TargetId<Fn>, C, References, ResolveHasAndBelongsToManyOptions<C, References, Options>>;
     type TargetResult<Fn extends Function> = Fn extends (() => infer Result) ? Result : never;
@@ -991,11 +991,11 @@ type OrmTableInstance<T> = T extends {
 type TableInstance<T> = T extends {
   new (): infer R extends ORMTableInput;
 } ? R : OrmTableInstance<T>;
-type OrchidORMTables<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = { [K in keyof TT]: OrchidORMTableHelper<TableQueryBuilder<TT, VT, TableInstance<TT[K]>>> };
+type OrchidORMTables<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = { [K in keyof TT]: OrchidORMTableHelper<TableQueryBuilder<TT, VT, TableInstance<TT[K]>>>; };
 type OrchidORMBundle<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = OrchidORMTables<TT, VT> & {
   $views: OrchidORMTables<VT, TT>;
 };
-type OrchidORMDbTables<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = { [K in keyof TT]: TableQueryBuilder<TT, VT, TableInstance<TT[K]>> };
+type OrchidORMDbTables<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = { [K in keyof TT]: TableQueryBuilder<TT, VT, TableInstance<TT[K]>>; };
 type OrchidORM<TT extends OrmTableThunks = OrmTableThunks, VT extends OrmTableThunks = OrmTableThunks> = OrchidORMDbTables<TT, VT> & {
   $views: OrchidORMDbTables<VT, TT>;
 } & OrchidORMMethods;
@@ -1160,10 +1160,7 @@ interface OrchidORMSetupOptions<V extends OrmTableThunks = OrmTableThunks> exten
    */
   views?: V;
 }
-declare const bundleOrchidORM: <T extends OrmTableThunks = EmptyObject, V extends OrmTableThunks = EmptyObject>({
-  tables,
-  views
-}: {
+declare const bundleOrchidORM: <T extends OrmTableThunks = EmptyObject, V extends OrmTableThunks = EmptyObject>({ tables, views }: {
   tables?: T;
   views?: V;
 }) => OrchidORMBundle<T, V>;
@@ -1223,7 +1220,7 @@ type RelationThunk = BelongsTo$1 | HasOne$1 | HasMany$1 | HasAndBelongsToMany$1;
 interface RelationThunks {
   [K: string]: RelationThunk;
 }
-type TableInstances<T extends OrmTableThunks> = { [K in keyof T]: TableInstance<T[K]> };
+type TableInstances<T extends OrmTableThunks> = { [K in keyof T]: TableInstance<T[K]>; };
 type TableClassInstances<T extends OrmTableThunks> = TableInstances<T>[keyof T];
 type RelationToTableInputById<Tables, Id extends string> = Tables extends {
   id: Id;
@@ -1232,10 +1229,10 @@ type RelationToTableInputByName<T extends OrmTableThunks, Id extends string> = {
   table: Id;
 } | {
   name: Id;
-} ? TableInstances<T>[K] : never }[keyof T];
-type RelationToTableInputFromClasses<T extends OrmTableThunks, Id extends string> = RelationToTableInputById<TableClassInstances<T>, Id> extends infer Result ? [Result] extends [never] ? RelationToTableInputByName<T, Id> : Result : never;
-type RelationToTableInput<TT extends OrmTableThunks, VT extends OrmTableThunks, Rel extends RelationThunkBase> = RelationToTableInputFromClasses<TT, Rel['id']> extends infer Result ? [Result] extends [never] ? RelationToTableInputFromClasses<VT, Rel['id']> extends infer Result ? [Result] extends [never] ? false : Result : never : Result : never;
-type RelationTableToQuery<TT extends OrmTableThunks, VT extends OrmTableThunks, Rel extends RelationThunkBase> = RelationToTableInput<TT, VT, Rel> extends infer Result extends ORMTableInput ? TableQueryBuilder<TT, VT, Result> : never;
+} ? TableInstances<T>[K] : never; }[keyof T];
+type RelationToTableInputFromClasses<T extends OrmTableThunks, Id extends string> = RelationToTableInputById<TableClassInstances<T>, Id> extends (infer Result) ? [Result] extends [never] ? RelationToTableInputByName<T, Id> : Result : never;
+type RelationToTableInput<TT extends OrmTableThunks, VT extends OrmTableThunks, Rel extends RelationThunkBase> = RelationToTableInputFromClasses<TT, Rel['id']> extends (infer Result) ? [Result] extends [never] ? RelationToTableInputFromClasses<VT, Rel['id']> extends (infer Result) ? [Result] extends [never] ? false : Result : never : Result : never;
+type RelationTableToQuery<TT extends OrmTableThunks, VT extends OrmTableThunks, Rel extends RelationThunkBase> = RelationToTableInput<TT, VT, Rel> extends (infer Result extends ORMTableInput) ? TableQueryBuilder<TT, VT, Result> : never;
 interface RelationConfigSelf {
   columns: {
     shape: Column.Shape.QueryInit;
@@ -1258,17 +1255,17 @@ type BelongsToRequired<T extends RelationConfigSelf, Rel extends BelongsTo$1, Re
 } ? Required : Rel['options'] extends {
   on: unknown;
 } ? false : BelongsToDefaultRequired<T, Rel, Related>;
-type BelongsToRelationInfo<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo$1> = RelationToTableInput<TC, VC, Rel> extends infer Related extends ORMTableInput ? BelongsToInfo<T, Rel['options']['columns'][number] & string, BelongsToRequired<T, Rel, Related>, BelongsToQuery<TableQueryBuilder<TC, VC, Related>, Name>> : never;
-type BelongsToCreateData<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo$1> = RelationToTableInput<TC, VC, Rel> extends infer Related extends ORMTableInput ? BelongsToDataForCreate<Name, Rel['options']['columns'][number] & string, BelongsToRequired<T, Rel, Related>, BelongsToQuery<TableQueryBuilder<TC, VC, Related>, Name>> : never;
+type BelongsToRelationInfo<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo$1> = RelationToTableInput<TC, VC, Rel> extends (infer Related extends ORMTableInput) ? BelongsToInfo<T, Rel['options']['columns'][number] & string, BelongsToRequired<T, Rel, Related>, BelongsToQuery<TableQueryBuilder<TC, VC, Related>, Name>> : never;
+type BelongsToCreateData<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo$1> = RelationToTableInput<TC, VC, Rel> extends (infer Related extends ORMTableInput) ? BelongsToDataForCreate<Name, Rel['options']['columns'][number] & string, BelongsToRequired<T, Rel, Related>, BelongsToQuery<TableQueryBuilder<TC, VC, Related>, Name>> : never;
 type RelationDataForCreate<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends keyof T['relations'] & string, Rel> = Rel extends HasOne$1 ? HasOneInfo<T, Name, Rel, HasOneQuery<T, Name, RelationTableToQuery<TC, VC, Rel>>>['dataForCreate'] : Rel extends HasMany$1 ? HasManyInfo<T, Name, Rel, HasManyQuery<T, Name, RelationTableToQuery<TC, VC, Rel>>>['dataForCreate'] : Rel extends HasAndBelongsToMany$1 ? HasAndBelongsToManyInfo<T, Name, Rel['options']['columns'][number] & string, HasAndBelongsToManyQuery<Name, RelationTableToQuery<TC, VC, Rel>>>['dataForCreate'] : never;
 type RelationInfoForName<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends keyof T['relations'] & string, Rel> = Rel extends BelongsTo$1 ? BelongsToRelationInfo<TC, VC, T, Name, Rel> : Rel extends HasOne$1 ? HasOneInfo<T, Name, Rel, HasOneQuery<T, Name, RelationTableToQuery<TC, VC, Rel>>> : Rel extends HasMany$1 ? HasManyInfo<T, Name, Rel, HasManyQuery<T, Name, RelationTableToQuery<TC, VC, Rel>>> : Rel extends HasAndBelongsToMany$1 ? HasAndBelongsToManyInfo<T, Name, Rel['options']['columns'][number] & string, HasAndBelongsToManyQuery<Name, RelationTableToQuery<TC, VC, Rel>>> : never;
-type RelationDataForCreateOptionalNames<T extends RelationConfigSelf> = { [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo$1 ? never : K }[keyof T['relations'] & string];
+type RelationDataForCreateOptionalNames<T extends RelationConfigSelf> = { [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo$1 ? never : K; }[keyof T['relations'] & string];
 type RelationDataForCreateValue<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends keyof T['relations'] & string> = RelationDataForCreate<TC, VC, T, Name, T['relations'][Name]>[Name];
 type BelongsToRelationCreateData<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Name extends keyof T['relations']> = Name extends keyof T['relations'] & string ? T['relations'][Name] extends BelongsTo$1 ? BelongsToCreateData<TC, VC, T, Name, T['relations'][Name]> : never : never;
-type BelongsToRelationsDataForCreate<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf> = { [K in keyof T['relations'] as T['relations'][K] extends BelongsTo$1 ? T['relations'][K]['options']['columns'][number] & string : never]: BelongsToRelationCreateData<TC, VC, T, K> };
-type RelationsDataForCreateOptional<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Names extends keyof T['relations'] & string = RelationDataForCreateOptionalNames<T>> = [Names] extends [never] ? EmptyObject : { [K in Names]?: RelationDataForCreateValue<TC, VC, T, K> };
+type BelongsToRelationsDataForCreate<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf> = { [K in keyof T['relations'] as T['relations'][K] extends BelongsTo$1 ? T['relations'][K]['options']['columns'][number] & string : never]: BelongsToRelationCreateData<TC, VC, T, K>; };
+type RelationsDataForCreateOptional<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends RelationConfigSelf, Names extends keyof T['relations'] & string = RelationDataForCreateOptionalNames<T>> = [Names] extends [never] ? EmptyObject : { [K in Names]?: RelationDataForCreateValue<TC, VC, T, K>; };
 interface TableQueryBuilder<TC extends OrmTableThunks, VC extends OrmTableThunks, T extends ORMTableInput> extends TableInfo, Db<T['table'] extends string ? T['table'] : T['name'], T['columns']['shape'], T['columns']['data'], T['types'], T['table'] extends string ? T['readOnly'] extends true ? true : undefined : T['readOnly'] extends false ? undefined : true, T> {
-  relations: T extends RelationConfigSelf ? { [K in keyof T['relations'] & string]: RelationInfoForName<TC, VC, T, K, T['relations'][K]> } : EmptyObject;
+  relations: T extends RelationConfigSelf ? { [K in keyof T['relations'] & string]: RelationInfoForName<TC, VC, T, K, T['relations'][K]>; } : EmptyObject;
   relationsDataForCreate: T extends RelationConfigSelf ? BelongsToRelationsDataForCreate<TC, VC, T> : EmptyObject;
   relationsDataForCreateOptional: T extends RelationConfigSelf ? RelationsDataForCreateOptional<TC, VC, T> : EmptyObject;
 }
@@ -1341,7 +1338,7 @@ type Queryable<T extends AnyTableForTypeHelpers> = T extends {
   data: {
     columns: infer Shape extends Column.Shape.QueryInit;
   };
-} ? { [K in keyof Shape]?: Shape[K]['__queryType'] } : never;
+} ? { [K in keyof Shape]?: Shape[K]['__queryType']; } : never;
 type DefaultSelect<T extends AnyTableForTypeHelpers> = T extends OrmTableForTypeHelpers ? ColumnsShape.DefaultOutput<T['data']['columns']> : T extends OrmLegacyTableForTypeHelpers ? ColumnsShape.DefaultOutput<T['columns']['shape']> : never;
 type SelectableFromShapeAndComputed<Shape extends Column.Shape.QueryInit, Computed> = Computed extends undefined ? ColumnsShape.Output<Shape> : Computed extends ((t: never) => infer R extends ComputedOptionsConfig) ? ColumnsShape.Output<Shape> & { [K in keyof R]: R[K] extends {
   result: {
@@ -1351,7 +1348,7 @@ type SelectableFromShapeAndComputed<Shape extends Column.Shape.QueryInit, Comput
   result: {
     value: infer Value extends Column.Pick.QueryColumn;
   };
-}) ? Value['__outputType'] : never } : ColumnsShape.Output<Shape>;
+}) ? Value['__outputType'] : never; } : ColumnsShape.Output<Shape>;
 type Selectable<T extends AnyTableForTypeHelpers> = T extends OrmTableForTypeHelpers ? SelectableFromShapeAndComputed<T['data']['columns'], T['data']['computed']> : T extends OrmLegacyTableForTypeHelpers ? SelectableFromShapeAndComputed<T['columns']['shape'], T['computed']> : never;
 type Insertable<T extends AnyTableForTypeHelpers> = T extends {
   columns: {
@@ -1623,18 +1620,9 @@ interface BaseMaterializedViewInstance<ColumnTypes> extends BaseTableInstance<Co
   readonly materialized: true;
   withData?: boolean;
 }
-declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig, ColumnTypes = DefaultColumnTypes<SchemaConfig>>({
-  schemaConfig,
-  columnTypes: columnTypesArg,
-  snakeCase,
-  filePath: filePathArg,
-  nowSQL,
-  exportAs,
-  language,
-  autoForeignKeys
-}?: TableFactoryOptions<SchemaConfig, ColumnTypes>): BaseTableClass<SchemaConfig, ColumnTypes>;
+declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig, ColumnTypes = DefaultColumnTypes<SchemaConfig>>({ schemaConfig, columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs, language, autoForeignKeys }?: TableFactoryOptions<SchemaConfig, ColumnTypes>): BaseTableClass<SchemaConfig, ColumnTypes>;
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;
-type QueryOne<T extends Query> = { [K in keyof T]: K extends 'returnType' ? Exclude<QueryReturnType, 'all' | undefined> : T[K] };
+type QueryOne<T extends Query> = { [K in keyof T]: K extends 'returnType' ? Exclude<QueryReturnType, 'all' | undefined> : T[K]; };
 interface MethodsBase<T extends Query> {
   queryMethods?: QueryMethods<T>;
   queryOneMethods?: QueryMethods<QueryOne<T>>;
@@ -1643,10 +1631,10 @@ interface MethodsBase<T extends Query> {
   methods?: RecordUnknown;
 }
 type MapQueryMethods<BaseQuery extends Query, Method> = Method extends ((q: any, ...args: infer Args) => infer Result) ? <T extends BaseQuery>(this: T, ...args: Args) => Result extends Query ? MergeQuery<T, Result> : Result : never;
-type MapMethods<T extends Query, Methods extends MethodsBase<T>> = { [K in keyof Methods['queryMethods'] | keyof Methods['queryOneMethods'] | keyof Methods['queryWithWhereMethods'] | keyof Methods['queryOneWithWhereMethods'] | keyof Methods['methods']]: K extends keyof Methods['methods'] ? Methods['methods'][K] : K extends keyof Methods['queryOneWithWhereMethods'] ? MapQueryMethods<QueryOne<Query & QueryHasWhere>, Methods['queryOneWithWhereMethods'][K]> : K extends keyof Methods['queryWithWhereMethods'] ? MapQueryMethods<Query & QueryHasWhere, Methods['queryWithWhereMethods'][K]> : K extends keyof Methods['queryOneMethods'] ? MapQueryMethods<QueryOne<Query>, Methods['queryOneMethods'][K]> : K extends keyof Methods['queryMethods'] ? MapQueryMethods<Query, Methods['queryMethods'][K]> : never };
+type MapMethods<T extends Query, Methods extends MethodsBase<T>> = { [K in keyof Methods['queryMethods'] | keyof Methods['queryOneMethods'] | keyof Methods['queryWithWhereMethods'] | keyof Methods['queryOneWithWhereMethods'] | keyof Methods['methods']]: K extends keyof Methods['methods'] ? Methods['methods'][K] : K extends keyof Methods['queryOneWithWhereMethods'] ? MapQueryMethods<QueryOne<Query & QueryHasWhere>, Methods['queryOneWithWhereMethods'][K]> : K extends keyof Methods['queryWithWhereMethods'] ? MapQueryMethods<Query & QueryHasWhere, Methods['queryWithWhereMethods'][K]> : K extends keyof Methods['queryOneMethods'] ? MapQueryMethods<QueryOne<Query>, Methods['queryOneMethods'][K]> : K extends keyof Methods['queryMethods'] ? MapQueryMethods<Query, Methods['queryMethods'][K]> : never; };
 type Repo<T extends Query, Methods extends MethodsBase<T>> = T & MapMethods<T, Methods>;
 declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(table: T, methods: Methods) => Repo<(<Q extends {
-  table: T["table"];
-  shape: T["shape"];
+  table: T['table'];
+  shape: T['shape'];
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T, Methods>;
 export { BaseMaterializedViewInstance, BaseTableClass, BaseTableInstance, BaseViewInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidORMBundle, OrchidORMDbTables, OrchidORMSetupOptions, OrchidORMTables, OrchidOrmParam, OrmLegacyTableForTypeHelpers, OrmTable, OrmTableForTypeHelpers, OrmTableThunks, PickORMTableComputed, PickORMTableInputColumns, PickORMTableInputColumnsAndComputed, Queryable, Repo, Selectable, SetColumnsResult, Table$1 as Table, TableClass, TableInfo, TableInstance, TableQueryBuilder, Updatable, bundleOrchidORM, bundleOrchidORMTables, createBaseTable, createRepo, createTableFactory, defineRls, makeOrchidOrmDbWithAdapter, orchidORMWithAdapter, setGrants };

package/dist/index.js

@@ -818,7 +818,8 @@ var BelongsToVirtualColumn = class extends pqb_internal.VirtualColumn {
 				(0, pqb_internal._onUpsertUpdate)(queryForCreate, (as) => {
 					createWhereNotExists._sql = `NOT EXISTS (SELECT 1 FROM "${as}")`;
 				});
-				createQuery = (0, pqb_internal._queryInsertManyFrom)(selectPKeys, (0, pqb_internal._queryWhere)((0, pqb_internal._queryTake)((0, pqb_internal._querySelect)((0, pqb_internal._clone)(query.qb), [{}])), [createWhereNotExists]), create.values);
+				const sourceQuery = (0, pqb_internal._queryWhere)((0, pqb_internal._queryTake)((0, pqb_internal._querySelect)((0, pqb_internal._clone)(query.qb), [{}])), [createWhereNotExists]);
+				createQuery = (0, pqb_internal._queryInsertManyFrom)(selectPKeys, sourceQuery, create.values);
 			} else createQuery = (0, pqb_internal._queryInsertMany)(selectPKeys, create.values);
 			const setForeignKeys = (as) => {
 				const count = create.items.length;
@@ -903,7 +904,8 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 	return ((self, update, params) => {
 		if (params.create) {
 			const createQuery = (0, pqb_internal._querySelect)((0, pqb_internal._queryCreate)(query.clone(), params.create), primaryKeys);
-			(0, pqb_internal._prependWith)(self, setForeignKeysFromCte(update, primaryKeys, foreignKeys), createQuery);
+			const asFn = setForeignKeysFromCte(update, primaryKeys, foreignKeys);
+			(0, pqb_internal._prependWith)(self, asFn, createQuery);
 		} else if (params.update) {
 			let appendedAs;
 			(0, pqb_internal._hookSelectColumns)(self, foreignKeys, (aliasedForeignKeys) => {
@@ -917,7 +919,8 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 			if ((0, pqb_internal.isQueryReturnsAll)(self)) throw new Error("`upsert` option is not allowed in a batch update");
 			const { relQuery } = relWithSelectIds(self, query, primaryKeys, foreignKeys);
 			const upsertQuery = (0, pqb_internal._querySelect)((0, pqb_internal._queryUpsert)(relQuery, params.upsert), primaryKeys);
-			(0, pqb_internal._prependWith)(self, setForeignKeysFromCte(update, primaryKeys, foreignKeys), upsertQuery);
+			const asFn = setForeignKeysFromCte(update, primaryKeys, foreignKeys);
+			(0, pqb_internal._prependWith)(self, asFn, upsertQuery);
 		} else if (params.delete) {
 			(0, pqb_internal._hookSelectColumns)(self, foreignKeys, pqb_internal.noop);
 			disconnect(update, foreignKeys);
@@ -939,7 +942,10 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys, len }) => {
 					(loadForeignKeys ??= []).push(foreignKeys[i]);
 				}
 			}
-			if (loadPrimaryKeys) (0, pqb_internal._prependWith)(self, setForeignKeysFromCte(update, loadPrimaryKeys, loadForeignKeys, true), (0, pqb_internal._queryFindBy)(query.select(...loadPrimaryKeys), params.set));
+			if (loadPrimaryKeys) {
+				const asFn = setForeignKeysFromCte(update, loadPrimaryKeys, loadForeignKeys, true);
+				(0, pqb_internal._prependWith)(self, asFn, (0, pqb_internal._queryFindBy)(query.select(...loadPrimaryKeys), params.set));
+			}
 		}
 	});
 };
@@ -1118,11 +1124,13 @@ var HasOneVirtualColumn = class extends pqb_internal.VirtualColumn {
 			const nullifyOrDeleteQuery = params.update ? (0, pqb_internal._queryUpdate)(ids.existingRelQuery, params.update) : params.upsert ? (0, pqb_internal._queryUpsert)(ids.existingRelQuery, makeNestedUpdateUpsertData(params.upsert, ids.setIds)) : params.delete ? (0, pqb_internal._queryDelete)(ids.existingRelQuery) : (0, pqb_internal._queryUpdate)(ids.existingRelQuery, this.setNulls);
 			nullifyOrDeleteQuery.q.returnType = "void";
 			(0, pqb_internal._appendQuery)(querySelf, nullifyOrDeleteQuery, ids.setAppendedAs);
-			if (params.create) (0, pqb_internal._appendQuery)(querySelf, (0, pqb_internal._queryInsert)((0, pqb_internal._clone)(relQuery), {
-				...params.create,
-				...ids.setIds
-			}), pqb_internal.noop);
-			else if (params.set) {
+			if (params.create) {
+				const createQuery = (0, pqb_internal._queryInsert)((0, pqb_internal._clone)(relQuery), {
+					...params.create,
+					...ids.setIds
+				});
+				(0, pqb_internal._appendQuery)(querySelf, createQuery, pqb_internal.noop);
+			} else if (params.set) {
 				const setQuery = (0, pqb_internal._queryUpdate)((0, pqb_internal._queryWhere)((0, pqb_internal._clone)(relQuery), [params.set]), ids.setIds);
 				setQuery.q.returnType = "void";
 				(0, pqb_internal._appendQuery)(querySelf, setQuery, pqb_internal.noop);
@@ -1606,10 +1614,11 @@ const nestedUpdateUpsert = (querySelf, state, upsert) => {
 		parentIdsSql._sql = selectCteColumnsSql(parentAs, aliasedPrimaryKeys);
 		for (let i = 0; i < state.foreignKeys.length; i++) parentValues[i]._sql = selectCteColumnSql(parentAs, aliasedPrimaryKeys[i]);
 	});
-	const upsertQuery = (0, pqb_internal._querySelect)((0, pqb_internal._queryUpsert)((0, pqb_internal._queryWhereExists)((0, pqb_internal._queryWhere)((0, pqb_internal._clone)(state.relatedTableQuery), [upsert.findBy]), state.joinTableQuery, [(q) => {
+	const existingRelQuery = (0, pqb_internal._queryWhereExists)((0, pqb_internal._queryWhere)((0, pqb_internal._clone)(state.relatedTableQuery), [upsert.findBy]), state.joinTableQuery, [(q) => {
 		for (let i = 0; i < state.throughPrimaryKeys.length; i++) (0, pqb_internal._queryJoinOn)(q, [state.throughForeignKeysFull[i], state.throughPrimaryKeysFull[i]]);
 		return (0, pqb_internal._queryWhereIn)(q, true, state.foreignKeysFull, parentIdsSql);
-	}]), {
+	}]);
+	const upsertQuery = (0, pqb_internal._querySelect)((0, pqb_internal._queryUpsert)(existingRelQuery, {
 		update: upsert.update,
 		create: upsert.create || {}
 	}), state.throughPrimaryKeys);
@@ -1912,7 +1921,8 @@ const nestedUpdate = (state) => {
 		}
 		if (params.disconnect) await (0, pqb_internal._queryDelete)(queryJoinTable(state, data, params.disconnect));
 		if (params.delete) {
-			const idsRows = await (0, pqb_internal._queryDelete)((0, pqb_internal._queryRows)((0, pqb_internal._querySelect)(queryJoinTable(state, data, params.delete), state.throughForeignKeys)));
+			const j = queryJoinTable(state, data, params.delete);
+			const idsRows = await (0, pqb_internal._queryDelete)((0, pqb_internal._queryRows)((0, pqb_internal._querySelect)(j, state.throughForeignKeys)));
 			await (0, pqb_internal._queryDelete)(state.relatedTableQuery.where({ IN: {
 				columns: state.throughPrimaryKeys,
 				values: idsRows
@@ -1921,7 +1931,10 @@ const nestedUpdate = (state) => {
 		if (params.set) {
 			const j = queryJoinTable(state, data);
 			await (0, pqb_internal._queryDelete)(j);
-			if (Array.isArray(params.set) ? params.set.length : (0, pqb_internal.objectHasValues)(params.set)) await insertToJoinTable(state, j, data, await (0, pqb_internal._queryRows)((0, pqb_internal._querySelect)(state.relatedTableQuery.where(conditionsToWhereArg(params.set)), state.throughPrimaryKeys)));
+			if (Array.isArray(params.set) ? params.set.length : (0, pqb_internal.objectHasValues)(params.set)) {
+				const idsRows = await (0, pqb_internal._queryRows)((0, pqb_internal._querySelect)(state.relatedTableQuery.where(conditionsToWhereArg(params.set)), state.throughPrimaryKeys));
+				await insertToJoinTable(state, j, data, idsRows);
+			}
 		}
 	});
 };