pqb 0.2.5 → 0.2.7

package/dist/index.d.ts

@@ -468,7 +468,7 @@ declare type OmitBelongsToForeignKeys<R extends RelationsBase, Data> = Omit<Data
     [K in keyof R]: R[K] extends BelongsToRelation ? R[K]['options']['foreignKey'] : never;
 }[keyof R]>;
 declare type InsertRelationData<T extends Query> = {
-    [Key in keyof T['relations']]: T['relations'][Key] extends BelongsToRelation ? InsertBelongsToData<T, Key, T['relations'][Key]> : T['relations'][Key] extends HasOneRelation ? InsertHasOneData<T, Key, T['relations'][Key]> : T['relations'][Key] extends HasManyRelation | HasAndBelongsToManyRelation ? InsertHasManyData<T, Key, T['relations'][Key]> : {};
+    [K in keyof T['relations']]: T['relations'][K] extends BelongsToRelation ? InsertBelongsToData<T, K, T['relations'][K]> : T['relations'][K] extends HasOneRelation ? InsertHasOneData<T, K, T['relations'][K]> : T['relations'][K] extends HasManyRelation | HasAndBelongsToManyRelation ? InsertHasManyData<T, K, T['relations'][K]> : EmptyObject;
 }[keyof T['relations']];
 declare type InsertBelongsToData<T extends Query, Key extends keyof T['relations'], Rel extends BelongsToRelation> = SetOptional<{
     [K in Rel['options']['foreignKey']]: Rel['options']['foreignKey'] extends keyof T['inputType'] ? T['inputType'][Rel['options']['foreignKey']] : never;
@@ -739,64 +739,61 @@ declare class Union {
 declare type UpdateData<T extends Query> = {
     [K in keyof T['type']]?: T['type'][K] | RawExpression;
 } & (T['relations'] extends Record<string, Relation> ? {
-    [K in keyof T['relations']]?: T['relations'][K]['type'] extends 'belongsTo' ? {
-        disconnect: boolean;
-    } | {
-        set: WhereArg<T['relations'][K]['model']>;
-    } | {
-        delete: boolean;
-    } | {
-        update: UpdateData<T['relations'][K]['model']>;
-    } | {
-        create: InsertData<T['relations'][K]['nestedCreateQuery']>;
-    } | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
-        upsert: {
-            update: UpdateData<T['relations'][K]['model']>;
-            create: InsertData<T['relations'][K]['nestedCreateQuery']>;
-        };
-    } : never) : T['relations'][K]['type'] extends 'hasOne' ? {
-        disconnect: boolean;
-    } | {
-        delete: boolean;
-    } | {
-        update: UpdateData<T['relations'][K]['model']>;
-    } | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
-        set: WhereArg<T['relations'][K]['model']>;
-    } | {
-        upsert: {
-            update: UpdateData<T['relations'][K]['model']>;
-            create: InsertData<T['relations'][K]['nestedCreateQuery']>;
-        };
-    } | {
-        create: InsertData<T['relations'][K]['nestedCreateQuery']>;
-    } : never) : T['relations'][K]['type'] extends 'hasMany' ? {
-        disconnect: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        delete: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        update: {
-            where: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-            data: UpdateData<T['relations'][K]['model']>;
-        };
-    } | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
-        set: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        create: InsertData<T['relations'][K]['nestedCreateQuery']>[];
-    } : never) : T['relations'][K]['type'] extends 'hasAndBelongsToMany' ? {
-        disconnect: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        set: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        delete: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-    } | {
-        update: {
-            where: MaybeArray<WhereArg<T['relations'][K]['model']>>;
-            data: UpdateData<T['relations'][K]['model']>;
-        };
-    } | {
-        create: InsertData<T['relations'][K]['nestedCreateQuery']>[];
-    } : never;
-} : {});
+    [K in keyof T['relations']]?: T['relations'][K] extends BelongsToRelation ? UpdateBelongsToData<T, T['relations'][K]> : T['relations'][K] extends HasOneRelation ? UpdateHasOneData<T, T['relations'][K]> : T['relations'][K] extends HasManyRelation ? UpdateHasManyData<T, T['relations'][K]> : T['relations'][K] extends HasAndBelongsToManyRelation ? UpdateHasAndBelongsToManyData<T['relations'][K]> : never;
+} : EmptyObject);
+declare type UpdateBelongsToData<T extends Query, Rel extends BelongsToRelation> = {
+    disconnect: boolean;
+} | {
+    set: WhereArg<Rel['model']>;
+} | {
+    delete: boolean;
+} | {
+    update: UpdateData<Rel['model']>;
+} | {
+    create: InsertData<Rel['nestedCreateQuery']>;
+} | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+    upsert: {
+        update: UpdateData<Rel['model']>;
+        create: InsertData<Rel['nestedCreateQuery']>;
+    };
+} : never);
+declare type UpdateHasOneData<T extends Query, Rel extends HasOneRelation> = {
+    disconnect: boolean;
+} | {
+    delete: boolean;
+} | {
+    update: UpdateData<Rel['model']>;
+} | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+    set: WhereArg<Rel['model']>;
+} | {
+    upsert: {
+        update: UpdateData<Rel['model']>;
+        create: InsertData<Rel['nestedCreateQuery']>;
+    };
+} | {
+    create: InsertData<Rel['nestedCreateQuery']>;
+} : never);
+declare type UpdateHasManyData<T extends Query, Rel extends HasManyRelation> = {
+    disconnect?: MaybeArray<WhereArg<Rel['model']>>;
+    delete?: MaybeArray<WhereArg<Rel['model']>>;
+    update?: {
+        where: MaybeArray<WhereArg<Rel['model']>>;
+        data: UpdateData<Rel['model']>;
+    };
+} & (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+    set?: MaybeArray<WhereArg<Rel['model']>>;
+    create?: InsertData<Rel['nestedCreateQuery']>[];
+} : EmptyObject);
+declare type UpdateHasAndBelongsToManyData<Rel extends HasAndBelongsToManyRelation> = {
+    disconnect?: MaybeArray<WhereArg<Rel['model']>>;
+    set?: MaybeArray<WhereArg<Rel['model']>>;
+    delete?: MaybeArray<WhereArg<Rel['model']>>;
+    update?: {
+        where: MaybeArray<WhereArg<Rel['model']>>;
+        data: UpdateData<Rel['model']>;
+    };
+    create?: InsertData<Rel['nestedCreateQuery']>[];
+};
 declare type UpdateArgs<T extends Query, ForceAll extends boolean> = (T['hasWhere'] extends true ? true : ForceAll) extends true ? [update: RawExpression | UpdateData<T>, forceAll?: ForceAll] : [update: RawExpression | UpdateData<T>, forceAll: true];
 declare type UpdateResult<T extends Query> = T['hasSelect'] extends false ? SetQueryReturnsRowCount<T> : T;
 declare type ChangeCountArg<T extends Query> = keyof T['shape'] | Partial<Record<keyof T['shape'], number>>;

package/dist/index.esm.js

@@ -2756,20 +2756,20 @@ const pushUpdateSql = (ctx, model, query, quotedAs) => {
     ctx.sql.push(`AS ${quotedAs}`);
   }
   ctx.sql.push("SET");
+  const set = [];
   query.data.forEach((item) => {
     if (isRaw(item)) {
-      ctx.sql.push(getRaw(item, ctx.values));
+      set.push(getRaw(item, ctx.values));
     } else {
-      const set = [];
       for (const key in item) {
         const value = item[key];
         if (value !== void 0) {
           set.push(`${q(key)} = ${processValue(ctx.values, key, value)}`);
         }
       }
-      ctx.sql.push(set.join(", "));
     }
   });
+  ctx.sql.push(set.join(", "));
   pushWhereStatementSql(ctx, model, query, quotedAs);
   pushReturningSql(ctx, model, query, quotedAs);
 };