fix imports

BSStudio · Apr 5, 2024 · 1769b47 · 1769b47
1 parent b45a78b
commit 1769b47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/database/postgres.ts b/src/database/postgres.ts
@@ -1,4 +1,4 @@
-import { Pool } from 'pg'
+import pg from 'pg'
 import config from '../config.js'
 
-export default new Pool(config.database)
+export default new pg.Pool(config.database)
diff --git a/src/middleware/postgraphile.ts b/src/middleware/postgraphile.ts
@@ -1,5 +1,6 @@
 import config from '../config.js'
 import { postgraphile, PostGraphileOptions } from 'postgraphile'
+import PgSimplifyInflectorPlugin from '@graphile-contrib/pg-simplify-inflector'
 import { postgres } from '../database/index.js'
 
 const options: PostGraphileOptions = {
@@ -11,7 +12,7 @@ const options: PostGraphileOptions = {
   setofFunctionsContainNulls: false,
   ignoreRBAC: false,
   extendedErrors: ['errcode'],
-  appendPlugins: [require('@graphile-contrib/pg-simplify-inflector')],
+  appendPlugins: [PgSimplifyInflectorPlugin.default],
   graphiql: false,
   enableQueryBatching: true,
   disableQueryLog: true,

diff --git a/tests/database/postgres.test.ts b/tests/database/postgres.test.ts
@@ -1,10 +1,12 @@
 import { describe, it, vi, expect } from 'vitest'
-import { Pool } from 'pg'
+import pg from 'pg'
 import config from '../../src/config.js'
 
 vi.mock('pg', () => {
   return {
-    Pool: vi.fn(),
+    default: {
+      Pool: vi.fn(),
+    },
   }
 })
 vi.mock('../../src/config', () => ({
@@ -13,7 +15,7 @@ vi.mock('../../src/config', () => ({
   },
 }))
 
-const mockPool = vi.mocked(Pool)
+const mockPg = vi.mocked(pg)
 const mockConfig = vi.mocked(config)
 
 describe('postgres', () => {
@@ -22,7 +24,7 @@ describe('postgres', () => {
 
     const { default: actual } = await import('../../src/database/postgres.js')
 
-    expect.soft(actual).toStrictEqual(new mockPool(mockConfig.database))
-    expect.soft(mockPool).toHaveBeenCalledWith(mockConfig.database)
+    expect.soft(actual).toStrictEqual(new pg.Pool(mockConfig.database))
+    expect.soft(pg.Pool).toHaveBeenCalledWith(mockConfig.database)
   })
 })