Merge pull request #1175 from jotel-dev/837-backend-pg-pool-created-without-max-idle-connection-statement-timeout-settings

837 backend pg pool created without max idle connection statement timeout settings

Author: ogazboiz

backend/src/lib/pg-pool.ts

@@ -10,15 +10,16 @@ const parsePositiveIntegerEnv = (name: string, defaultValue: number): number =>
   return Number.isInteger(parsedValue) && parsedValue > 0 ? parsedValue : defaultValue;
 };
 
-export const createPgPoolConfig = (): pg.PoolConfig => ({
+export const createPgPoolConfig = (overrides?: Partial<pg.PoolConfig>): pg.PoolConfig => ({
   connectionString: process.env.DATABASE_URL,
   max: parsePositiveIntegerEnv('PG_POOL_MAX', 10),
   idleTimeoutMillis: parsePositiveIntegerEnv('PG_IDLE_TIMEOUT_MS', 30_000),
   connectionTimeoutMillis: parsePositiveIntegerEnv('PG_CONNECTION_TIMEOUT_MS', 5_000),
   statement_timeout: parsePositiveIntegerEnv('PG_STATEMENT_TIMEOUT_MS', 30_000),
+  ...overrides,
 });
 
-export const createPgPool = () => new pg.Pool(createPgPoolConfig());
+export const createPgPool = (overrides?: Partial<pg.PoolConfig>) => new pg.Pool(createPgPoolConfig(overrides));
 
 export interface PoolMetrics {
   totalCount: number;

backend/tests/integration/stream-lifecycle.test.ts

@@ -251,8 +251,9 @@ describe("Stream Lifecycle Integration Tests", () => {
     const { PrismaClient } = await import(
       "../../src/generated/prisma/index.js"
     );
+    const { createPgPool } = await import("../../src/lib/pg-pool.js");
     const connectionString = resolveTestDatabaseUrl();
-    testPool = new pg.Pool({ connectionString });
+    testPool = createPgPool({ connectionString });
     const testAdapter = new PrismaPg(testPool);
     testPrisma = new PrismaClient({
       adapter: testAdapter,

backend/tests/pg-pool.test.ts

@@ -23,25 +23,71 @@ describe('pg-pool', () => {
     vi.unstubAllEnvs();
   });
 
-  it('createPgPoolConfig reflects an overridden DATABASE_URL', async () => {
-    vi.stubEnv('DATABASE_URL', 'postgresql://test:test@localhost:5432/test_db');
+  it('createPgPoolConfig returns sane default pool settings when env vars are unset', async () => {
+    const { createPgPoolConfig } = await import('../src/lib/pg-pool.js');
+    const config = createPgPoolConfig();
+
+    expect(config.max).toBe(10);
+    expect(config.idleTimeoutMillis).toBe(30_000);
+    expect(config.connectionTimeoutMillis).toBe(5_000);
+    expect(config.statement_timeout).toBe(30_000);
+  });
+
+  it('createPgPoolConfig reflects custom env variable overrides', async () => {
+    vi.stubEnv('PG_POOL_MAX', '25');
+    vi.stubEnv('PG_IDLE_TIMEOUT_MS', '60000');
+    vi.stubEnv('PG_CONNECTION_TIMEOUT_MS', '10000');
+    vi.stubEnv('PG_STATEMENT_TIMEOUT_MS', '15000');
 
     const { createPgPoolConfig } = await import('../src/lib/pg-pool.js');
+    const config = createPgPoolConfig();
 
-    expect(createPgPoolConfig().connectionString).toBe(
-      'postgresql://test:test@localhost:5432/test_db',
-    );
+    expect(config.max).toBe(25);
+    expect(config.idleTimeoutMillis).toBe(60_000);
+    expect(config.connectionTimeoutMillis).toBe(10_000);
+    expect(config.statement_timeout).toBe(15_000);
+  });
+
+  it('createPgPoolConfig falls back to defaults when env variables are invalid or non-positive', async () => {
+    vi.stubEnv('PG_POOL_MAX', 'invalid_number');
+    vi.stubEnv('PG_IDLE_TIMEOUT_MS', '-5000');
+    vi.stubEnv('PG_CONNECTION_TIMEOUT_MS', '0');
+    vi.stubEnv('PG_STATEMENT_TIMEOUT_MS', 'abc');
+
+    const { createPgPoolConfig } = await import('../src/lib/pg-pool.js');
+    const config = createPgPoolConfig();
+
+    expect(config.max).toBe(10);
+    expect(config.idleTimeoutMillis).toBe(30_000);
+    expect(config.connectionTimeoutMillis).toBe(5_000);
+    expect(config.statement_timeout).toBe(30_000);
   });
 
-  it('createPgPool constructs pg.Pool with the configured DATABASE_URL without opening a real connection', async () => {
+  it('createPgPool constructs pg.Pool with default pool configuration settings', async () => {
     vi.stubEnv('DATABASE_URL', 'postgresql://test:test@localhost:5432/test_db');
 
     const { createPgPool } = await import('../src/lib/pg-pool.js');
     createPgPool();
 
+    expect(poolCtorSpy).toHaveBeenCalledWith({
+      connectionString: 'postgresql://test:test@localhost:5432/test_db',
+      max: 10,
+      idleTimeoutMillis: 30_000,
+      connectionTimeoutMillis: 5_000,
+      statement_timeout: 30_000,
+    });
+  });
+
+  it('createPgPool applies config overrides when provided', async () => {
+    const { createPgPool } = await import('../src/lib/pg-pool.js');
+    createPgPool({ max: 5, statement_timeout: 5000 });
+
     expect(poolCtorSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        connectionString: 'postgresql://test:test@localhost:5432/test_db',
+        max: 5,
+        statement_timeout: 5000,
+        idleTimeoutMillis: 30_000,
+        connectionTimeoutMillis: 5_000,
       }),
     );
   });