pqb 0.2.7 → 0.2.9

package/package.json

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

package/src/queryMethods/then.ts

@@ -18,10 +18,10 @@ export const queryMethodByReturnType: Record<
   'query' | 'arrays'
 > = {
   all: 'query',
-  one: 'query',
-  oneOrThrow: 'query',
   rows: 'arrays',
   pluck: 'arrays',
+  one: 'query',
+  oneOrThrow: 'query',
   value: 'arrays',
   valueOrThrow: 'arrays',
   rowCount: 'arrays',

package/src/queryMethods/update.ts

@@ -15,6 +15,7 @@ import { WhereArg, WhereResult } from './where';
 import { EmptyObject, MaybeArray } from '../utils';
 import { InsertData } from './insert';
 import { parseResult, queryMethodByReturnType } from './then';
+import { UpdateQueryData } from '../sql';
 
 export type UpdateData<T extends Query> = {
   [K in keyof T['type']]?: T['type'][K] | RawExpression;
@@ -40,21 +41,22 @@ type UpdateBelongsToData<T extends Query, Rel extends BelongsToRelation> =
   | {
       create: InsertData<Rel['nestedCreateQuery']>;
     }
-  | (T['returnType'] extends 'one' | 'oneOrThrow'
-      ? {
+  | (T['returnType'] extends 'all'
+      ? never
+      : {
           upsert: {
             update: UpdateData<Rel['model']>;
             create: InsertData<Rel['nestedCreateQuery']>;
           };
-        }
-      : never);
+        });
 
 type UpdateHasOneData<T extends Query, Rel extends HasOneRelation> =
   | { disconnect: boolean }
   | { delete: boolean }
   | { update: UpdateData<Rel['model']> }
-  | (T['returnType'] extends 'one' | 'oneOrThrow'
-      ?
+  | (T['returnType'] extends 'all'
+      ? never
+      :
           | { set: WhereArg<Rel['model']> }
           | {
               upsert: {
@@ -64,8 +66,7 @@ type UpdateHasOneData<T extends Query, Rel extends HasOneRelation> =
             }
           | {
               create: InsertData<Rel['nestedCreateQuery']>;
-            }
-      : never);
+            });
 
 type UpdateHasManyData<T extends Query, Rel extends HasManyRelation> = {
   disconnect?: MaybeArray<WhereArg<Rel['model']>>;
@@ -74,12 +75,12 @@ type UpdateHasManyData<T extends Query, Rel extends HasManyRelation> = {
     where: MaybeArray<WhereArg<Rel['model']>>;
     data: UpdateData<Rel['model']>;
   };
-} & (T['returnType'] extends 'one' | 'oneOrThrow'
-  ? {
+} & (T['returnType'] extends 'all'
+  ? EmptyObject
+  : {
       set?: MaybeArray<WhereArg<Rel['model']>>;
       create?: InsertData<Rel['nestedCreateQuery']>[];
-    }
-  : EmptyObject);
+    });
 
 type UpdateHasAndBelongsToManyData<Rel extends HasAndBelongsToManyRelation> = {
   disconnect?: MaybeArray<WhereArg<Rel['model']>>;
@@ -127,6 +128,10 @@ const applyCountChange = <T extends Query>(
   return self as unknown as UpdateResult<T>;
 };
 
+const checkIfUpdateIsEmpty = (q: UpdateQueryData) => {
+  return !q.data?.some((item) => isRaw(item) || Object.keys(item).length);
+};
+
 export class Update {
   update<T extends Query, ForceAll extends boolean = false>(
     this: T,
@@ -157,6 +162,9 @@ export class Update {
     if (isRaw(data)) {
       pushQueryValue(this, 'data', data);
     } else {
+      const update: Record<string, unknown> = { ...data };
+      pushQueryValue(this, 'data', update);
+
       const relations = this.relations as Record<string, Relation>;
 
       const prependRelations: Record<string, Record<string, unknown>> = {};
@@ -164,7 +172,6 @@ export class Update {
 
       const originalReturnType = this.query.returnType;
 
-      const update: Record<string, unknown> = { ...data };
       for (const key in data) {
         if (relations[key]) {
           delete update[key];
@@ -188,8 +195,9 @@ export class Update {
       } = {};
 
       const prependRelationKeys = Object.keys(prependRelations);
+      let willSetKeys = false;
       if (prependRelationKeys.length) {
-        const willSetKeys = prependRelationKeys.some((relationName) => {
+        willSetKeys = prependRelationKeys.some((relationName) => {
           const data = prependRelations[relationName] as NestedUpdateOneItem;
 
           return (
@@ -198,11 +206,9 @@ export class Update {
             }
           ).nestedUpdate(this, update, data, state);
         });
+      }
 
-        if (!willSetKeys && !Object.keys(update).length) {
-          delete this.query.type;
-        }
-      } else if (!Object.keys(update).length) {
+      if (!willSetKeys && checkIfUpdateIsEmpty(this.query as UpdateQueryData)) {
         delete this.query.type;
       }
 
@@ -283,8 +289,6 @@ export class Update {
       if (prependRelationKeys.length || appendRelationKeys.length) {
         query.wrapInTransaction = true;
       }
-
-      pushQueryValue(this, 'data', update);
     }
 
     if (!query.select) {