Follow the postgres lib recommendation from Supabase (#41)

2026-09-05 08:10:14 +00:00 · 2025-05-19 12:24:35 -07:00 · 2025-05-19 12:24:35 -07:00 · b376ed186d
commit b376ed186d
parent fcf1104a45
7 changed files with 37 additions and 29 deletions
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@ -34,7 +34,7 @@ jobs:
        run: pnpm install

      - name: Build Next.js
-        run: pnpm build
+        run: npx dotenvx run -f .env.test -- pnpm build

  test:
    runs-on: ubuntu-latest
--- a/package.json
+++ b/package.json
@ -62,9 +62,9 @@
    "next-intl": "^4.1.0",
    "next-themes": "^0.4.6",
    "next-typesafe-url": "^5.1.7",
-    "pg": "^8.13.0",
    "pino": "^9.5.0",
    "pino-pretty": "^13.0.0",
+    "postgres": "^3.4.5",
    "prettier": "^3.5.3",
    "react": "^19.1.0",
    "react-dom": "^19.1.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -94,10 +94,10 @@ importers:
        version: 4.1.0
      drizzle-orm:
        specifier: ^0.43.1
-        version: 0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)
+        version: 0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)(postgres@3.4.5)
      drizzle-zod:
        specifier: ^0.7.1
-        version: 0.7.1(drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6))(zod@3.24.4)
+        version: 0.7.1(drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)(postgres@3.4.5))(zod@3.24.4)
      lucide-react:
        specifier: ^0.509.0
        version: 0.509.0(react@19.1.0)
@ -113,15 +113,15 @@ importers:
      next-typesafe-url:
        specifier: ^5.1.7
        version: 5.1.7(next@15.3.2(@babel/core@7.27.1)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0)(zod@3.24.4)
-      pg:
-        specifier: ^8.13.0
-        version: 8.15.6
      pino:
        specifier: ^9.5.0
        version: 9.6.0
      pino-pretty:
        specifier: ^13.0.0
        version: 13.0.0
+      postgres:
+        specifier: ^3.4.5
+        version: 3.4.5
      prettier:
        specifier: ^3.5.3
        version: 3.5.3
@ -7175,6 +7175,10 @@ packages:
  postgres-range@1.1.4:
    resolution: {integrity: sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==}

+  postgres@3.4.5:
+    resolution: {integrity: sha512-cDWgoah1Gez9rN3H4165peY9qfpEo+SA61oQv65O3cRUE1pOEoJWwddwcqKE8XZYjbblOJlYDlLV4h67HrEVDg==}
+    engines: {node: '>=12'}
+
  prelude-ls@1.2.1:
    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
    engines: {node: '>= 0.8.0'}
@ -13848,17 +13852,18 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6):
+  drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)(postgres@3.4.5):
    optionalDependencies:
      '@electric-sql/pglite': 0.3.0
      '@libsql/client-wasm': 0.15.5
      '@opentelemetry/api': 1.9.0
      '@types/pg': 8.15.1
      pg: 8.15.6
+      postgres: 3.4.5

-  drizzle-zod@0.7.1(drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6))(zod@3.24.4):
+  drizzle-zod@0.7.1(drizzle-orm@0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)(postgres@3.4.5))(zod@3.24.4):
    dependencies:
-      drizzle-orm: 0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)
+      drizzle-orm: 0.43.1(@electric-sql/pglite@0.3.0)(@libsql/client-wasm@0.15.5)(@opentelemetry/api@1.9.0)(@types/pg@8.15.1)(pg@8.15.6)(postgres@3.4.5)
      zod: 3.24.4

  dunder-proto@1.0.1:
@ -16430,7 +16435,8 @@ snapshots:
  pg-cloudflare@1.2.5:
    optional: true

-  pg-connection-string@2.8.5: {}
+  pg-connection-string@2.8.5:
+    optional: true

  pg-int8@1.0.1: {}

@ -16439,6 +16445,7 @@ snapshots:
  pg-pool@3.9.6(pg@8.15.6):
    dependencies:
      pg: 8.15.6
+    optional: true

  pg-protocol@1.9.5: {}

@ -16469,10 +16476,12 @@ snapshots:
      pgpass: 1.0.5
    optionalDependencies:
      pg-cloudflare: 1.2.5
+    optional: true

  pgpass@1.0.5:
    dependencies:
      split2: 4.2.0
+    optional: true

  picocolors@1.1.1: {}

@ -16639,6 +16648,8 @@ snapshots:

  postgres-range@1.1.4: {}

+  postgres@3.4.5: {}
+
  prelude-ls@1.2.1: {}

  prettier@3.5.3: {}
--- a/src/actions/sync.ts
+++ b/src/actions/sync.ts
@ -146,13 +146,11 @@ type SyncAuth = {
 };

 export async function syncAuth({ userId, orgId, orgRole }: SyncAuth) {
-  if (!userId) {
-    return;
-  }
-
-  await syncCurrentUser({ userId, orgId, orgRole });
-
  if (orgId) {
    await syncOrg(orgId);
  }
+
+  if (userId) {
+    await syncCurrentUser({ userId, orgId, orgRole });
+  }
 }
--- a/src/db/db.ts
+++ b/src/db/db.ts
@ -1,29 +1,28 @@
-import { drizzle } from 'drizzle-orm/node-postgres';
-import { Pool } from 'pg';
+import { drizzle } from 'drizzle-orm/postgres-js';
+import postgres from 'postgres';

 import { Env } from '@/lib/server';

-const pool = new Pool({
-  connectionString: process.env.DATABASE_URL,
-});
+const pgClient = postgres(Env.DATABASE_URL, { prepare: false });

 let testDb: ReturnType<typeof drizzle> | undefined = undefined;

 if (process.env.NODE_ENV === 'test') {
  if (
-    !Env.DATABASE_URL?.includes('test') ||
-    !Env.DATABASE_URL?.includes('localhost')
+    !Env.DATABASE_URL.includes('test') ||
+    !Env.DATABASE_URL.includes('localhost')
  ) {
    throw new Error('DATABASE_URL is not a test database');
  }

-  testDb = drizzle(pool);
+  testDb = drizzle({ client: pgClient });
 }

-const client = process.env.NODE_ENV === 'test' ? testDb! : drizzle(pool);
+const client =
+  process.env.NODE_ENV === 'test' ? testDb! : drizzle({ client: pgClient });

 const disconnect = async () => {
-  await pool.end();
+  await pgClient.end();
 };

 type DatabaseOrTransaction =
--- a/src/lib/server/env.ts
+++ b/src/lib/server/env.ts
@ -4,7 +4,7 @@ import { z } from 'zod';
 export const Env = createEnv({
  server: {
    CLERK_SECRET_KEY: z.string().min(1),
-    DATABASE_URL: z.string().optional(),
+    DATABASE_URL: z.string(),
    LOGTAIL_SOURCE_TOKEN: z.string().optional(),
    VSCODE_EXTENSION_BASE_URL: z.string().min(1),
    CURSOR_EXTENSION_BASE_URL: z.string().min(1),
--- a/vitest-global-setup.ts
+++ b/vitest-global-setup.ts
@ -14,7 +14,7 @@ async function resetTestDatabase() {
      AND table_type = 'BASE TABLE';
    `);

-    const tableNames = (tables.rows || []).map(({ table_name }) => table_name);
+    const tableNames = tables.map((t) => t.table_name);

    for (const tableName of tableNames) {
      await db.execute(sql`TRUNCATE TABLE "${sql.raw(tableName)}" CASCADE;`);