refactor: prefer pool over single client for pg

src/db/index.ts

@@ -1,16 +1,16 @@
 import { sql } from "drizzle-orm";
 import { NodePgDatabase, drizzle } from "drizzle-orm/node-postgres";
 import { PgColumn } from "drizzle-orm/pg-core";
-import { Client } from "pg";
+import { Pool } from "pg";
 import { config } from "../config";
 import * as schema from "./schema";
 
 let DATABASE: NodePgDatabase<typeof schema> | null = null;
-let connection: Client | null = null;
+let connection: Pool | null = null;
 
-export const getPgConnection = async () => {
+export const getPgPool = async () => {
     if (connection === null) {
-        connection = new Client({
+        connection = new Pool({
             host: config.getenv("DB_HOST"),
             port: parseInt(config.getenv("DB_PORT")),
             user: config.getenv("DB_USER"),
@@ -23,9 +23,9 @@ export const getPgConnection = async () => {
 
 export const getDatabase = async (): Promise<NodePgDatabase<typeof schema>> => {
     if (DATABASE === null) {
-        const client = await getPgConnection();
-        await client.connect();
-        DATABASE = drizzle(client, { schema });
+        const pool = await getPgPool();
+        await pool.connect();
+        DATABASE = drizzle(pool, { schema });
     }
     return DATABASE;
 };

src/index.ts

@@ -1,7 +1,7 @@
 import { LogLevel, SapphireClient, container } from "@sapphire/framework";
 import { ActivityType, GatewayIntentBits, Partials } from "discord.js";
 import { config } from "./config";
-import { getDatabase, getPgConnection } from "./db";
+import { getDatabase, getPgPool } from "./db";
 import { getLoggerInstance } from "./logger";
 import { PinoLoggerAdapter } from "./utils/bot";
 
@@ -27,19 +27,20 @@ const client = new SapphireClient({
 
 const main = async () => {
     container.drizzle = await getDatabase();
-    container.pg = await getPgConnection();
+    container.pool = await getPgPool();
     await client.login(config.getenv("DISCORD_TOKEN"));
 };
 
 const cleanup = () => {
-    container.pg.end();
+    container.pool.end();
 };
 
 main().catch((error) => {
     container.logger.error(error);
 });
 
-process.on("uncaughtException", () => {
+process.on("uncaughtException", (error) => {
+    console.error(error);
     cleanup();
 });
 

src/migrate.ts

@@ -1,11 +1,11 @@
 import { migrate } from "drizzle-orm/node-postgres/migrator";
-import { getDatabase, getPgConnection } from "./db";
+import { getDatabase, getPgPool } from "./db";
 
 (async () => {
     console.info("Getting database");
     const db = await getDatabase();
     console.info("Getting pg connection");
-    const connection = await getPgConnection();
+    const connection = await getPgPool();
     console.info("Running migration");
     await migrate(db, { migrationsFolder: "./drizzle" });
     console.info("Closing pg connection");

src/types.d.ts

@@ -1,11 +1,11 @@
 import "@sapphire/framework";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Pool } from "pg";
 import * as schema from "./db/schema";
-import { Client } from "pg";
 
 declare module "@sapphire/pieces" {
     interface Container {
         drizzle: NodePgDatabase<typeof schema>;
-        pg: Client;
+        pool: Pool;
     }
 }