revert(db-vercel-postgres): roll back @neondatabase/serverless migration

Author: siimsams

packages/db-vercel-postgres/package.json

@@ -74,8 +74,8 @@
     "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"
   },
   "dependencies": {
-    "@neondatabase/serverless": "^1.0.2",
     "@payloadcms/drizzle": "workspace:*",
+    "@vercel/postgres": "^0.10.0",
     "console-table-printer": "2.12.1",
     "drizzle-kit": "0.31.7",
     "drizzle-orm": "0.45.2",

packages/db-vercel-postgres/src/connect.ts

@@ -1,10 +1,9 @@
-import type { DrizzleAdapter } from '@payloadcms/drizzle'
+import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
 import type { Connect, Migration } from 'payload'
 
-import { Pool as NeonPool } from '@neondatabase/serverless'
 import { pushDevSchema } from '@payloadcms/drizzle'
-import { drizzle as drizzleNeon } from 'drizzle-orm/neon-serverless'
-import { drizzle as drizzlePg } from 'drizzle-orm/node-postgres'
+import { sql, VercelPool } from '@vercel/postgres'
+import { drizzle } from 'drizzle-orm/node-postgres'
 import { withReplicas } from 'drizzle-orm/pg-core'
 import pg from 'pg'
 
@@ -21,39 +20,42 @@ export const connect: Connect = async function connect(
   try {
     const logger = this.logger || false
 
+    let client: pg.Pool | VercelPool
+
     const connectionString = this.poolOptions?.connectionString ?? process.env.POSTGRES_URL
 
     // Use non-vercel postgres for local database
-    const useLocalPg =
+    if (
       !this.forceUseVercelPostgres &&
       connectionString &&
       ['127.0.0.1', 'localhost'].includes(new URL(connectionString).hostname)
-
-    if (useLocalPg) {
-      const client = new pg.Pool(
+    ) {
+      client = new pg.Pool(
         this.poolOptions ?? {
           connectionString,
         },
       )
-      this.drizzle = drizzlePg({ client, logger, schema: this.schema })
     } else {
-      const client = new NeonPool(this.poolOptions ?? { connectionString })
-      this.drizzle = drizzleNeon({ client, logger, schema: this.schema })
+      client = this.poolOptions ? new VercelPool(this.poolOptions) : sql
     }
 
+    // Passed the poolOptions if provided,
+    // else have vercel/postgres detect the connection string from the environment
+    this.drizzle = drizzle({
+      client: client as pg.Pool,
+      logger,
+      schema: this.schema,
+    })
+
     if (this.readReplicaOptions) {
       this.primaryDrizzle = this.drizzle as any
       const readReplicas = this.readReplicaOptions.map((connectionString) => {
         const options = {
           ...this.poolOptions,
           connectionString,
         }
-        if (useLocalPg) {
-          const pool = new pg.Pool(options)
-          return drizzlePg({ client: pool, logger, schema: this.schema })
-        }
-        const pool = new NeonPool(options)
-        return drizzleNeon({ client: pool, logger, schema: this.schema })
+        const pool = new VercelPool(options)
+        return drizzle({ client: pool as unknown as pg.Pool, logger, schema: this.schema })
       })
       const myReplicas = withReplicas(this.drizzle, readReplicas as any)
       this.drizzle = myReplicas

packages/db-vercel-postgres/src/types.ts

@@ -1,14 +1,15 @@
-import type { Pool, PoolConfig } from '@neondatabase/serverless'
 import type {
   BasePostgresAdapter,
   GenericEnum,
   MigrateDownArgs,
   MigrateUpArgs,
+  PostgresDB,
   PostgresSchemaHook,
 } from '@payloadcms/drizzle/postgres'
 import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
+import type { VercelPool, VercelPostgresPoolConfig } from '@vercel/postgres'
 import type { DrizzleConfig } from 'drizzle-orm'
-import type { NeonDatabase } from 'drizzle-orm/neon-serverless'
+import type { NodePgDatabase } from 'drizzle-orm/node-postgres'
 import type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-core'
 
 export type Args = {
@@ -44,8 +45,10 @@ export type Args = {
   disableCreateDatabase?: boolean
   extensions?: string[]
   /**
-   * By default, we connect to a local database using the `pg` module instead of `@neondatabase/serverless`.
-   * If you still want to use `@neondatabase/serverless` even locally you can pass `true` here.
+   * By default, we connect to a local database using the `pg` module instead of `@vercel/postgres`.
+   * This is because `@vercel/postgres` doesn't work with local databases.
+   * If you still want to use `@vercel/postgres` even locally you can pass `true` here
+   * and you'd to spin up the database with a special Neon's Docker Compose setup - https://vercel.com/docs/storage/vercel-postgres/local-development#option-2:-local-postgres-instance-with-docker
    */
   forceUseVercelPostgres?: boolean
   /** Generated schema from payload generate:db-schema file path */
@@ -55,10 +58,10 @@ export type Args = {
   logger?: DrizzleConfig['logger']
   migrationDir?: string
   /**
-   * Optional pool configuration
-   * If not provided, will attempt to use the Vercel/Neon environment variables
+   * Optional pool configuration for Vercel Postgres
+   * If not provided, vercel/postgres will attempt to use the Vercel environment variables
    */
-  pool?: PoolConfig
+  pool?: VercelPostgresPoolConfig
   prodMigrations?: {
     down: (args: MigrateDownArgs) => Promise<void>
     name: string
@@ -93,12 +96,12 @@ type ResolveSchemaType<T> = 'schema' extends keyof T
   ? T['schema']
   : GeneratedDatabaseSchema['schemaUntyped']
 
-type Drizzle = NeonDatabase<ResolveSchemaType<GeneratedDatabaseSchema>>
+type Drizzle = NodePgDatabase<ResolveSchemaType<GeneratedDatabaseSchema>>
 
 export type VercelPostgresAdapter = {
   drizzle: Drizzle
   forceUseVercelPostgres?: boolean
-  pool?: Pool
+  pool?: VercelPool
   poolOptions?: Args['pool']
 } & BasePostgresAdapter
 
@@ -123,7 +126,7 @@ declare module 'payload' {
     localesSuffix?: string
     logger: DrizzleConfig['logger']
     pgSchema?: { table: PgTableFn } | PgSchema
-    pool: Pool
+    pool: VercelPool
     poolOptions: Args['pool']
     prodMigrations?: {
       down: (args: MigrateDownArgs) => Promise<void>