pqb 0.3.7 → 0.3.8

package/package.json

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

package/src/queryMethods/then.test.ts

@@ -1,12 +1,18 @@
-import { db } from '../test-utils';
+import { assertType, User } from '../test-utils';
+import { raw } from '../common';
+import { columnTypes } from '../columnSchema';
 
 describe('then', () => {
   describe('catch', () => {
-    it.only('should catch error', (done) => {
-      db('kokoko').catch((err) => {
-        expect(err.message).toBe(`relation "kokoko" does not exist`);
+    it('should catch error', (done) => {
+      const query = User.select({
+        column: raw(columnTypes.boolean(), 'koko'),
+      }).catch((err) => {
+        expect(err.message).toBe(`column "koko" does not exist`);
         done();
       });
+
+      assertType<Awaited<typeof query>, { column: boolean }[] | void>();
     });
   });
 });

package/src/queryMethods/then.ts

@@ -44,11 +44,11 @@ export class Then {
     }
   }
 
-  async catch<Result>(
-    this: Query,
+  async catch<T extends Query, Result>(
+    this: T,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     fn: (reason: any) => Result | PromiseLike<Result>,
-  ): Promise<Result> {
+  ): Promise<ReturnType<T['then']> | Result> {
     return this.then(undefined, fn);
   }
 }