pqb 0.2.6 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "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.test.ts

@@ -413,4 +413,29 @@ describe('update', () => {
       expect(eq).toBe(true);
     });
   });
+
+  describe('chaining', () => {
+    it('should handle multiple updates with increment and decrement', () => {
+      const query = User.select('id')
+        .find(1)
+        .update({ name: 'name' })
+        .increment('id')
+        .update({ password: 'password' })
+        .decrement('age');
+
+      expectSql(
+        query.toSql(),
+        `
+          UPDATE "user"
+          SET "name" = $1,
+              "id" = "id" + $2,
+              "password" = $3,
+              "age" = "age" - $4
+          WHERE "user"."id" = $5
+          RETURNING "user"."id"
+        `,
+        ['name', 1, 'password', 1, 1],
+      );
+    });
+  });
 });

package/src/queryMethods/update.ts

@@ -40,21 +40,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 +65,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 +74,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']>>;

package/src/sql/update.ts

@@ -21,22 +21,20 @@ export const pushUpdateSql = (
 
   ctx.sql.push('SET');
 
+  const set: string[] = [];
   query.data.forEach((item) => {
     if (isRaw(item)) {
-      ctx.sql.push(getRaw(item, ctx.values));
+      set.push(getRaw(item, ctx.values));
     } else {
-      const set: string[] = [];
-
       for (const key in item) {
         const value = item[key];
         if (value !== undefined) {
           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);