@prisma/adapter-pg 6.6.0-dev.32 → 6.6.0-dev.34

package/README.md

@@ -47,14 +47,12 @@ npm install @prisma/adapter-pg
 Finally, when you instantiate Prisma Client, you need to pass an instance of Prisma ORM's driver adapter to the `PrismaClient` constructor:
 
 ```ts
-import { Pool } from 'pg'
 import { PrismaPg } from '@prisma/adapter-pg'
 import { PrismaClient } from '@prisma/client'
 
 const connectionString = `${process.env.DATABASE_URL}`
 
-const pool = new Pool({ connectionString })
-const adapter = new PrismaPg(pool)
+const adapter = new PrismaPg({ connectionString })
 const prisma = new PrismaClient({ adapter })
 ```
 

package/dist/index.d.mts

@@ -1,51 +1,19 @@
-import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
-import type { SqlConnection } from '@prisma/driver-adapter-utils';
-import type { SqlQuery } from '@prisma/driver-adapter-utils';
-import type { SqlQueryable } from '@prisma/driver-adapter-utils';
-import type { SqlResultSet } from '@prisma/driver-adapter-utils';
-import type { TransactionContext } from '@prisma/driver-adapter-utils';
+import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import type { SqlMigrationAwareDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
-declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
-    protected readonly client: ClientT;
+export declare class PrismaPg implements SqlMigrationAwareDriverAdapterFactory {
+    private readonly config;
+    private readonly options?;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(client: ClientT);
-    /**
-     * Execute a query given as SQL, interpolating the given parameters.
-     */
-    queryRaw(query: SqlQuery): Promise<SqlResultSet>;
-    /**
-     * Execute a query given as SQL, interpolating the given parameters and
-     * returning the number of affected rows.
-     * Note: Queryable expects a u64, but napi.rs only supports u32.
-     */
-    executeRaw(query: SqlQuery): Promise<number>;
-    /**
-     * Run a query against the database, returning the result set.
-     * Should the query fail due to a connection error, the connection is
-     * marked as unhealthy.
-     */
-    private performIO;
-    protected onError(error: any): never;
-}
-
-export declare class PrismaPg extends PgQueryable<StdClient> implements SqlConnection {
-    private options?;
-    private readonly release?;
-    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
-    executeScript(script: string): Promise<void>;
-    getConnectionInfo(): ConnectionInfo;
-    transactionContext(): Promise<TransactionContext>;
-    dispose(): Promise<void>;
+    constructor(config: pg.PoolConfig, options?: PrismaPgOptions | undefined);
+    connect(): Promise<SqlDriverAdapter>;
+    connectToShadowDb(): Promise<SqlDriverAdapter>;
 }
 
 declare type PrismaPgOptions = {
     schema?: string;
 };
 
-declare type StdClient = pg.Pool;
-
-declare type TransactionClient = pg.PoolClient;
-
 export { }

package/dist/index.d.ts

@@ -1,51 +1,19 @@
-import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
-import type { SqlConnection } from '@prisma/driver-adapter-utils';
-import type { SqlQuery } from '@prisma/driver-adapter-utils';
-import type { SqlQueryable } from '@prisma/driver-adapter-utils';
-import type { SqlResultSet } from '@prisma/driver-adapter-utils';
-import type { TransactionContext } from '@prisma/driver-adapter-utils';
+import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import type { SqlMigrationAwareDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
-declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
-    protected readonly client: ClientT;
+export declare class PrismaPg implements SqlMigrationAwareDriverAdapterFactory {
+    private readonly config;
+    private readonly options?;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(client: ClientT);
-    /**
-     * Execute a query given as SQL, interpolating the given parameters.
-     */
-    queryRaw(query: SqlQuery): Promise<SqlResultSet>;
-    /**
-     * Execute a query given as SQL, interpolating the given parameters and
-     * returning the number of affected rows.
-     * Note: Queryable expects a u64, but napi.rs only supports u32.
-     */
-    executeRaw(query: SqlQuery): Promise<number>;
-    /**
-     * Run a query against the database, returning the result set.
-     * Should the query fail due to a connection error, the connection is
-     * marked as unhealthy.
-     */
-    private performIO;
-    protected onError(error: any): never;
-}
-
-export declare class PrismaPg extends PgQueryable<StdClient> implements SqlConnection {
-    private options?;
-    private readonly release?;
-    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
-    executeScript(script: string): Promise<void>;
-    getConnectionInfo(): ConnectionInfo;
-    transactionContext(): Promise<TransactionContext>;
-    dispose(): Promise<void>;
+    constructor(config: pg.PoolConfig, options?: PrismaPgOptions | undefined);
+    connect(): Promise<SqlDriverAdapter>;
+    connectToShadowDb(): Promise<SqlDriverAdapter>;
 }
 
 declare type PrismaPgOptions = {
     schema?: string;
 };
 
-declare type StdClient = pg.Pool;
-
-declare type TransactionClient = pg.PoolClient;
-
 export { }

package/dist/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  PrismaPg: () => PrismaPg
+  PrismaPg: () => PrismaPgAdapterFactory
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -484,32 +484,34 @@ var PgTransaction = class extends PgQueryable {
     this.client.release();
   }
 };
-var PgTransactionContext = class extends PgQueryable {
-  constructor(conn) {
-    super(conn);
-    this.conn = conn;
+var PrismaPgAdapter = class extends PgQueryable {
+  constructor(client, options, release) {
+    super(client);
+    this.options = options;
+    this.release = release;
   }
-  async startTransaction() {
+  async startTransaction(isolationLevel) {
     const options = {
       usePhantomQuery: false
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return new PgTransaction(this.conn, options);
-  }
-};
-var PrismaPg = class extends PgQueryable {
-  constructor(client, options, release) {
-    if (!client) {
-      throw new TypeError(`PrismaPg must be initialized with an instance of Pool:
-import { Pool } from 'pg'
-const pool = new Pool({ connectionString: url })
-const adapter = new PrismaPg(pool)
-`);
+    const conn = await this.client.connect();
+    const tx = new PgTransaction(conn, options);
+    try {
+      await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
+      if (isolationLevel) {
+        await tx.executeRaw({
+          sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
+          args: [],
+          argTypes: []
+        });
+      }
+      return tx;
+    } catch (error) {
+      conn.release(error);
+      throw error;
     }
-    super(client);
-    this.options = options;
-    this.release = release;
   }
   async executeScript(script) {
     for (const stmt of script.split(";")) {
@@ -525,15 +527,32 @@ const adapter = new PrismaPg(pool)
       schemaName: this.options?.schema
     };
   }
-  async transactionContext() {
-    const conn = await this.client.connect();
-    return new PgTransactionContext(conn);
-  }
   async dispose() {
     await this.release?.();
     return await this.client.end();
   }
 };
+var PrismaPgAdapterFactory = class {
+  constructor(config, options) {
+    this.config = config;
+    this.options = options;
+  }
+  provider = "postgres";
+  adapterName = name;
+  async connect() {
+    return new PrismaPgAdapter(new import_pg2.default.Pool(this.config), this.options, async () => {
+    });
+  }
+  async connectToShadowDb() {
+    const conn = await this.connect();
+    const database = `prisma_migrate_shadow_db_${globalThis.crypto.randomUUID()}`;
+    await conn.executeScript(`CREATE DATABASE "${database}"`);
+    return new PrismaPgAdapter(new import_pg2.default.Pool({ ...this.config, database }), void 0, async () => {
+      await conn.executeScript(`DROP DATABASE "${database}"`);
+      await conn.dispose();
+    });
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PrismaPg

package/dist/index.mjs

@@ -448,32 +448,34 @@ var PgTransaction = class extends PgQueryable {
     this.client.release();
   }
 };
-var PgTransactionContext = class extends PgQueryable {
-  constructor(conn) {
-    super(conn);
-    this.conn = conn;
+var PrismaPgAdapter = class extends PgQueryable {
+  constructor(client, options, release) {
+    super(client);
+    this.options = options;
+    this.release = release;
   }
-  async startTransaction() {
+  async startTransaction(isolationLevel) {
     const options = {
       usePhantomQuery: false
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return new PgTransaction(this.conn, options);
-  }
-};
-var PrismaPg = class extends PgQueryable {
-  constructor(client, options, release) {
-    if (!client) {
-      throw new TypeError(`PrismaPg must be initialized with an instance of Pool:
-import { Pool } from 'pg'
-const pool = new Pool({ connectionString: url })
-const adapter = new PrismaPg(pool)
-`);
+    const conn = await this.client.connect();
+    const tx = new PgTransaction(conn, options);
+    try {
+      await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
+      if (isolationLevel) {
+        await tx.executeRaw({
+          sql: `SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`,
+          args: [],
+          argTypes: []
+        });
+      }
+      return tx;
+    } catch (error) {
+      conn.release(error);
+      throw error;
     }
-    super(client);
-    this.options = options;
-    this.release = release;
   }
   async executeScript(script) {
     for (const stmt of script.split(";")) {
@@ -489,15 +491,32 @@ const adapter = new PrismaPg(pool)
       schemaName: this.options?.schema
     };
   }
-  async transactionContext() {
-    const conn = await this.client.connect();
-    return new PgTransactionContext(conn);
-  }
   async dispose() {
     await this.release?.();
     return await this.client.end();
   }
 };
+var PrismaPgAdapterFactory = class {
+  constructor(config, options) {
+    this.config = config;
+    this.options = options;
+  }
+  provider = "postgres";
+  adapterName = name;
+  async connect() {
+    return new PrismaPgAdapter(new pg2.Pool(this.config), this.options, async () => {
+    });
+  }
+  async connectToShadowDb() {
+    const conn = await this.connect();
+    const database = `prisma_migrate_shadow_db_${globalThis.crypto.randomUUID()}`;
+    await conn.executeScript(`CREATE DATABASE "${database}"`);
+    return new PrismaPgAdapter(new pg2.Pool({ ...this.config, database }), void 0, async () => {
+      await conn.executeScript(`DROP DATABASE "${database}"`);
+      await conn.dispose();
+    });
+  }
+};
 export {
-  PrismaPg
+  PrismaPgAdapterFactory as PrismaPg
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "6.6.0-dev.32",
+  "version": "6.6.0-dev.34",
   "description": "Prisma's driver adapter for \"pg\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,7 +32,7 @@
   "sideEffects": false,
   "dependencies": {
     "postgres-array": "3.0.4",
-    "@prisma/driver-adapter-utils": "6.6.0-dev.32"
+    "@prisma/driver-adapter-utils": "6.6.0-dev.34"
   },
   "devDependencies": {
     "@swc/core": "1.11.5",