@prisma/adapter-pg 6.13.0-dev.2 → 6.13.0-dev.20

package/dist/index.d.mts

@@ -1,19 +1,67 @@
+import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
+import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
 import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import type { SqlMigrationAwareDriverAdapterFactory } 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 { Transaction } from '@prisma/driver-adapter-utils';
+
+declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
+    protected readonly client: ClientT;
+    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 implements SqlMigrationAwareDriverAdapterFactory {
-    private readonly config;
     private readonly options?;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(config: pg.PoolConfig, options?: PrismaPgOptions | undefined);
-    connect(): Promise<SqlDriverAdapter>;
-    connectToShadowDb(): Promise<SqlDriverAdapter>;
+    private readonly config;
+    private externalPool;
+    constructor(poolOrConfig: pg.Pool | pg.PoolConfig, options?: PrismaPgOptions | undefined);
+    connect(): Promise<PrismaPgAdapter>;
+    connectToShadowDb(): Promise<PrismaPgAdapter>;
+}
+
+declare class PrismaPgAdapter extends PgQueryable<StdClient> implements SqlDriverAdapter {
+    private options?;
+    private readonly release?;
+    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
+    startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
+    executeScript(script: string): Promise<void>;
+    getConnectionInfo(): ConnectionInfo;
+    dispose(): Promise<void>;
+    underlyingDriver(): pg.Pool;
 }
 
 declare type PrismaPgOptions = {
     schema?: string;
+    disposeExternalPool?: boolean;
+    onPoolError?: (err: Error) => void;
 };
 
+declare type StdClient = pg.Pool;
+
+declare type TransactionClient = pg.PoolClient;
+
 export { }

package/dist/index.d.ts

@@ -1,19 +1,67 @@
+import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
+import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
 import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import type { SqlMigrationAwareDriverAdapterFactory } 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 { Transaction } from '@prisma/driver-adapter-utils';
+
+declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
+    protected readonly client: ClientT;
+    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 implements SqlMigrationAwareDriverAdapterFactory {
-    private readonly config;
     private readonly options?;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(config: pg.PoolConfig, options?: PrismaPgOptions | undefined);
-    connect(): Promise<SqlDriverAdapter>;
-    connectToShadowDb(): Promise<SqlDriverAdapter>;
+    private readonly config;
+    private externalPool;
+    constructor(poolOrConfig: pg.Pool | pg.PoolConfig, options?: PrismaPgOptions | undefined);
+    connect(): Promise<PrismaPgAdapter>;
+    connectToShadowDb(): Promise<PrismaPgAdapter>;
+}
+
+declare class PrismaPgAdapter extends PgQueryable<StdClient> implements SqlDriverAdapter {
+    private options?;
+    private readonly release?;
+    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
+    startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
+    executeScript(script: string): Promise<void>;
+    getConnectionInfo(): ConnectionInfo;
+    dispose(): Promise<void>;
+    underlyingDriver(): pg.Pool;
 }
 
 declare type PrismaPgOptions = {
     schema?: string;
+    disposeExternalPool?: boolean;
+    onPoolError?: (err: Error) => void;
 };
 
+declare type StdClient = pg.Pool;
+
+declare type TransactionClient = pg.PoolClient;
+
 export { }

package/dist/index.js

@@ -373,7 +373,63 @@ function fixArrayBufferValues(values) {
 }
 
 // src/errors.ts
+var TLS_ERRORS = /* @__PURE__ */ new Set([
+  "UNABLE_TO_GET_ISSUER_CERT",
+  "UNABLE_TO_GET_CRL",
+  "UNABLE_TO_DECRYPT_CERT_SIGNATURE",
+  "UNABLE_TO_DECRYPT_CRL_SIGNATURE",
+  "UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY",
+  "CERT_SIGNATURE_FAILURE",
+  "CRL_SIGNATURE_FAILURE",
+  "CERT_NOT_YET_VALID",
+  "CERT_HAS_EXPIRED",
+  "CRL_NOT_YET_VALID",
+  "CRL_HAS_EXPIRED",
+  "ERROR_IN_CERT_NOT_BEFORE_FIELD",
+  "ERROR_IN_CERT_NOT_AFTER_FIELD",
+  "ERROR_IN_CRL_LAST_UPDATE_FIELD",
+  "ERROR_IN_CRL_NEXT_UPDATE_FIELD",
+  "DEPTH_ZERO_SELF_SIGNED_CERT",
+  "SELF_SIGNED_CERT_IN_CHAIN",
+  "UNABLE_TO_GET_ISSUER_CERT_LOCALLY",
+  "UNABLE_TO_VERIFY_LEAF_SIGNATURE",
+  "CERT_CHAIN_TOO_LONG",
+  "CERT_REVOKED",
+  "INVALID_CA",
+  "INVALID_PURPOSE",
+  "CERT_UNTRUSTED",
+  "CERT_REJECTED",
+  "HOSTNAME_MISMATCH",
+  "ERR_TLS_CERT_ALTNAME_FORMAT",
+  "ERR_TLS_CERT_ALTNAME_INVALID"
+]);
+var SOCKET_ERRORS = /* @__PURE__ */ new Set(["ENOTFOUND", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"]);
 function convertDriverError(error) {
+  if (isSocketError(error)) {
+    switch (error.code) {
+      case "ENOTFOUND":
+      case "ECONNREFUSED":
+        return {
+          kind: "DatabaseNotReachable",
+          host: error.address ?? error.hostname,
+          port: error.port
+        };
+      case "ECONNRESET":
+        return {
+          kind: "ConnectionClosed"
+        };
+      case "ETIMEDOUT":
+        return {
+          kind: "SocketTimeout"
+        };
+    }
+  }
+  if (isTlsError(error)) {
+    return {
+      kind: "TlsConnectionError",
+      reason: error.message
+    };
+  }
   if (!isDbError(error)) {
     throw error;
   }
@@ -468,6 +524,20 @@ function convertDriverError(error) {
 function isDbError(error) {
   return typeof error.code === "string" && typeof error.message === "string" && typeof error.severity === "string" && (typeof error.detail === "string" || error.detail === void 0) && (typeof error.column === "string" || error.column === void 0) && (typeof error.hint === "string" || error.hint === void 0);
 }
+function isSocketError(error) {
+  return typeof error.code === "string" && typeof error.syscall === "string" && typeof error.errno === "number" && SOCKET_ERRORS.has(error.code);
+}
+function isTlsError(error) {
+  if (typeof error.code === "string") {
+    return TLS_ERRORS.has(error.code);
+  }
+  switch (error.message) {
+    case "The server does not support SSL connections":
+    case "There was an error establishing an SSL connection":
+      return true;
+  }
+  return false;
+}
 
 // src/pg.ts
 var types2 = import_pg2.default.types;
@@ -620,27 +690,55 @@ var PrismaPgAdapter = class extends PgQueryable {
     };
   }
   async dispose() {
-    await this.release?.();
-    return await this.client.end();
+    return this.release?.();
+  }
+  underlyingDriver() {
+    return this.client;
   }
 };
 var PrismaPgAdapterFactory = class {
-  constructor(config, options) {
-    this.config = config;
+  constructor(poolOrConfig, options) {
     this.options = options;
+    if (poolOrConfig instanceof import_pg2.default.Pool) {
+      this.externalPool = poolOrConfig;
+      this.config = poolOrConfig.options;
+    } else {
+      this.externalPool = null;
+      this.config = poolOrConfig;
+    }
   }
   provider = "postgres";
   adapterName = name;
+  config;
+  externalPool;
   async connect() {
-    return new PrismaPgAdapter(new import_pg2.default.Pool(this.config), this.options, async () => {
+    const client = this.externalPool ?? new import_pg2.default.Pool(this.config);
+    const onIdleClientError = (err) => {
+      debug(`Error from idle pool client: ${err.message} %O`, err);
+      this.options?.onPoolError?.(err);
+    };
+    client.on("error", onIdleClientError);
+    return new PrismaPgAdapter(client, this.options, async () => {
+      if (this.externalPool) {
+        if (this.options?.disposeExternalPool) {
+          await this.externalPool.end();
+          this.externalPool = null;
+        } else {
+          this.externalPool.removeListener("error", onIdleClientError);
+        }
+      } else {
+        await client.end();
+      }
     });
   }
   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 () => {
+    const client = new import_pg2.default.Pool({ ...this.config, database });
+    return new PrismaPgAdapter(client, void 0, async () => {
       await conn.executeScript(`DROP DATABASE "${database}"`);
+      await client.end();
     });
   }
 };

package/dist/index.mjs

@@ -337,7 +337,63 @@ function fixArrayBufferValues(values) {
 }
 
 // src/errors.ts
+var TLS_ERRORS = /* @__PURE__ */ new Set([
+  "UNABLE_TO_GET_ISSUER_CERT",
+  "UNABLE_TO_GET_CRL",
+  "UNABLE_TO_DECRYPT_CERT_SIGNATURE",
+  "UNABLE_TO_DECRYPT_CRL_SIGNATURE",
+  "UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY",
+  "CERT_SIGNATURE_FAILURE",
+  "CRL_SIGNATURE_FAILURE",
+  "CERT_NOT_YET_VALID",
+  "CERT_HAS_EXPIRED",
+  "CRL_NOT_YET_VALID",
+  "CRL_HAS_EXPIRED",
+  "ERROR_IN_CERT_NOT_BEFORE_FIELD",
+  "ERROR_IN_CERT_NOT_AFTER_FIELD",
+  "ERROR_IN_CRL_LAST_UPDATE_FIELD",
+  "ERROR_IN_CRL_NEXT_UPDATE_FIELD",
+  "DEPTH_ZERO_SELF_SIGNED_CERT",
+  "SELF_SIGNED_CERT_IN_CHAIN",
+  "UNABLE_TO_GET_ISSUER_CERT_LOCALLY",
+  "UNABLE_TO_VERIFY_LEAF_SIGNATURE",
+  "CERT_CHAIN_TOO_LONG",
+  "CERT_REVOKED",
+  "INVALID_CA",
+  "INVALID_PURPOSE",
+  "CERT_UNTRUSTED",
+  "CERT_REJECTED",
+  "HOSTNAME_MISMATCH",
+  "ERR_TLS_CERT_ALTNAME_FORMAT",
+  "ERR_TLS_CERT_ALTNAME_INVALID"
+]);
+var SOCKET_ERRORS = /* @__PURE__ */ new Set(["ENOTFOUND", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"]);
 function convertDriverError(error) {
+  if (isSocketError(error)) {
+    switch (error.code) {
+      case "ENOTFOUND":
+      case "ECONNREFUSED":
+        return {
+          kind: "DatabaseNotReachable",
+          host: error.address ?? error.hostname,
+          port: error.port
+        };
+      case "ECONNRESET":
+        return {
+          kind: "ConnectionClosed"
+        };
+      case "ETIMEDOUT":
+        return {
+          kind: "SocketTimeout"
+        };
+    }
+  }
+  if (isTlsError(error)) {
+    return {
+      kind: "TlsConnectionError",
+      reason: error.message
+    };
+  }
   if (!isDbError(error)) {
     throw error;
   }
@@ -432,6 +488,20 @@ function convertDriverError(error) {
 function isDbError(error) {
   return typeof error.code === "string" && typeof error.message === "string" && typeof error.severity === "string" && (typeof error.detail === "string" || error.detail === void 0) && (typeof error.column === "string" || error.column === void 0) && (typeof error.hint === "string" || error.hint === void 0);
 }
+function isSocketError(error) {
+  return typeof error.code === "string" && typeof error.syscall === "string" && typeof error.errno === "number" && SOCKET_ERRORS.has(error.code);
+}
+function isTlsError(error) {
+  if (typeof error.code === "string") {
+    return TLS_ERRORS.has(error.code);
+  }
+  switch (error.message) {
+    case "The server does not support SSL connections":
+    case "There was an error establishing an SSL connection":
+      return true;
+  }
+  return false;
+}
 
 // src/pg.ts
 var types2 = pg2.types;
@@ -584,27 +654,55 @@ var PrismaPgAdapter = class extends PgQueryable {
     };
   }
   async dispose() {
-    await this.release?.();
-    return await this.client.end();
+    return this.release?.();
+  }
+  underlyingDriver() {
+    return this.client;
   }
 };
 var PrismaPgAdapterFactory = class {
-  constructor(config, options) {
-    this.config = config;
+  constructor(poolOrConfig, options) {
     this.options = options;
+    if (poolOrConfig instanceof pg2.Pool) {
+      this.externalPool = poolOrConfig;
+      this.config = poolOrConfig.options;
+    } else {
+      this.externalPool = null;
+      this.config = poolOrConfig;
+    }
   }
   provider = "postgres";
   adapterName = name;
+  config;
+  externalPool;
   async connect() {
-    return new PrismaPgAdapter(new pg2.Pool(this.config), this.options, async () => {
+    const client = this.externalPool ?? new pg2.Pool(this.config);
+    const onIdleClientError = (err) => {
+      debug(`Error from idle pool client: ${err.message} %O`, err);
+      this.options?.onPoolError?.(err);
+    };
+    client.on("error", onIdleClientError);
+    return new PrismaPgAdapter(client, this.options, async () => {
+      if (this.externalPool) {
+        if (this.options?.disposeExternalPool) {
+          await this.externalPool.end();
+          this.externalPool = null;
+        } else {
+          this.externalPool.removeListener("error", onIdleClientError);
+        }
+      } else {
+        await client.end();
+      }
     });
   }
   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 () => {
+    const client = new pg2.Pool({ ...this.config, database });
+    return new PrismaPgAdapter(client, void 0, async () => {
       await conn.executeScript(`DROP DATABASE "${database}"`);
+      await client.end();
     });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "6.13.0-dev.2",
+  "version": "6.13.0-dev.20",
   "description": "Prisma's driver adapter for \"pg\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,7 +33,7 @@
   "dependencies": {
     "postgres-array": "3.0.4",
     "pg": "^8.11.3",
-    "@prisma/driver-adapter-utils": "6.13.0-dev.2"
+    "@prisma/driver-adapter-utils": "6.13.0-dev.20"
   },
   "devDependencies": {
     "@swc/core": "1.11.5",