pqb 0.3.6 → 0.3.7

package/src/queryMethods/update.test.ts

@@ -1,5 +1,5 @@
 import {
-  AssertEqual,
+  assertType,
   expectQueryNotMutated,
   expectSql,
   User,
@@ -48,8 +48,7 @@ describe('update', () => {
       [users[0].id, users[1].id],
     );
 
-    const eq: AssertEqual<Awaited<typeof query>, number> = true;
-    expect(eq).toBe(true);
+    assertType<Awaited<typeof query>, number>();
 
     const result = await query;
     expect(result).toBe(count);
@@ -77,8 +76,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, number> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, number>();
 
     expect(result).toBe(1);
 
@@ -109,8 +107,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, number> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, number>();
 
     expect(typeof result).toBe('number');
 
@@ -137,8 +134,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, { id: number; name: string }> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, { id: number; name: string }>();
 
     const updated = await User.take();
     expect(updated).toMatchObject({ ...userData, ...update });
@@ -163,8 +159,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, typeof User.type> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, typeof User.type>();
 
     const updated = await User.take();
     expect(updated).toMatchObject({ ...userData, ...update });
@@ -196,8 +191,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, { id: number; name: string }[]> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, { id: number; name: string }[]>();
 
     const updated = await User.take();
     expect(updated).toMatchObject({ ...userData, ...update });
@@ -231,8 +225,7 @@ describe('update', () => {
     const result = await query;
     expect(result[0]).toMatchObject({ ...userData, ...update });
 
-    const eq: AssertEqual<typeof result, typeof User['type'][]> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, typeof User['type'][]>();
 
     const updated = await User.take();
     expect(updated).toMatchObject({ ...userData, ...update });
@@ -256,8 +249,7 @@ describe('update', () => {
       ['new name', null, 1],
     );
 
-    const eq: AssertEqual<Awaited<typeof query>, number> = true;
-    expect(eq).toBe(true);
+    assertType<Awaited<typeof query>, number>();
   });
 
   it('should support raw sql as a value', () => {
@@ -274,8 +266,7 @@ describe('update', () => {
       [1],
     );
 
-    const eq: AssertEqual<Awaited<typeof query>, number> = true;
-    expect(eq).toBe(true);
+    assertType<Awaited<typeof query>, number>();
   });
 
   it('should return one record when searching for one to update', async () => {
@@ -301,8 +292,7 @@ describe('update', () => {
     );
 
     const result = await query;
-    const eq: AssertEqual<typeof result, typeof User.type> = true;
-    expect(eq).toBe(true);
+    assertType<typeof result, typeof User.type>();
 
     expect(result).toMatchObject({ ...userData, ...update });
   });
@@ -312,8 +302,7 @@ describe('update', () => {
       .findBy({ id: 1 })
       .update({ name: 'new name' });
 
-    const eq: AssertEqual<Awaited<typeof query>, typeof User.type> = true;
-    expect(eq).toBe(true);
+    assertType<Awaited<typeof query>, typeof User.type>();
 
     await expect(query).rejects.toThrow();
   });
@@ -378,8 +367,7 @@ describe('update', () => {
         [3],
       );
 
-      const eq: AssertEqual<Awaited<typeof query>, { id: number }[]> = true;
-      expect(eq).toBe(true);
+      assertType<Awaited<typeof query>, { id: number }[]>();
     });
   });
 
@@ -423,8 +411,7 @@ describe('update', () => {
         [3],
       );
 
-      const eq: AssertEqual<Awaited<typeof query>, { id: number }[]> = true;
-      expect(eq).toBe(true);
+      assertType<Awaited<typeof query>, { id: number }[]>();
     });
   });
 

package/src/queryMethods/upsert.test.ts

@@ -1,4 +1,4 @@
-import { AssertEqual, User, userData, useTestDatabase } from '../test-utils';
+import { assertType, User, userData, useTestDatabase } from '../test-utils';
 
 describe('upsert', () => {
   useTestDatabase();
@@ -9,8 +9,7 @@ describe('upsert', () => {
       create: userData,
     });
 
-    const eq: AssertEqual<Awaited<typeof query>, void> = true;
-    expect(eq).toBe(true);
+    assertType<Awaited<typeof query>, void>();
   });
 
   it('should update record if exists', async () => {

package/src/queryMethods/window.test.ts

@@ -1,5 +1,5 @@
 import {
-  AssertEqual,
+  assertType,
   expectQueryNotMutated,
   expectSql,
   User,
@@ -33,8 +33,7 @@ describe('window functions', () => {
           partitionBy: 'age',
         });
 
-        const eq: AssertEqual<typeof value, { row_number: number }[]> = true;
-        expect(eq).toBe(true);
+        assertType<typeof value, { row_number: number }[]>();
 
         expect(value).toEqual(
           (results as number[]).map((item) => ({ [functionName]: item })),

package/src/test-utils.ts

@@ -4,7 +4,6 @@ import {
   patchPgForTransactions,
   rollbackTransaction,
   startTransaction,
-  unpatchPgForTransactions,
 } from 'pg-transactional-tests';
 import { Client } from 'pg';
 import { quote } from './quote';
@@ -88,7 +87,7 @@ export const expectQueryNotMutated = (q: Query) => {
   expectSql(q.toSql(), `SELECT * FROM "${q.table}"`);
 };
 
-export type AssertEqual<T, Expected> = [T] extends [Expected]
+type AssertEqual<T, Expected> = [T] extends [Expected]
   ? [Expected] extends [T]
     ? true
     : false
@@ -138,17 +137,10 @@ export const messageData = {
 };
 
 export const useTestDatabase = () => {
-  beforeAll(() => {
-    patchPgForTransactions();
-  });
-  beforeEach(async () => {
-    await startTransaction(dbClient);
-  });
-  afterEach(async () => {
-    await rollbackTransaction(dbClient);
-  });
+  beforeAll(patchPgForTransactions);
+  beforeEach(startTransaction);
+  afterEach(rollbackTransaction);
   afterAll(async () => {
-    unpatchPgForTransactions();
     await dbClient.end();
   });
 };