@prisma/adapter-pg 6.5.0-dev.7 → 6.5.0-dev.70

package/dist/index.d.mts

@@ -1,13 +1,12 @@
 import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
-import type { DriverAdapter } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
-import type { Query } from '@prisma/driver-adapter-utils';
-import type { Queryable } from '@prisma/driver-adapter-utils';
-import type { Result } from '@prisma/driver-adapter-utils';
-import type { ResultSet } from '@prisma/driver-adapter-utils';
+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';
 
-declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements Queryable {
+declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
     protected readonly client: ClientT;
     readonly provider = "postgres";
     readonly adapterName: string;
@@ -15,26 +14,30 @@ declare class PgQueryable<ClientT extends StdClient | TransactionClient> impleme
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
-    queryRaw(query: Query): Promise<Result<ResultSet>>;
+    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: Query): Promise<Result<number>>;
+    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 DriverAdapter {
+export declare class PrismaPg extends PgQueryable<StdClient> implements SqlConnection {
     private options?;
-    constructor(client: pg.Pool, options?: PrismaPgOptions | undefined);
-    getConnectionInfo(): Result<ConnectionInfo>;
-    transactionContext(): Promise<Result<TransactionContext>>;
+    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>;
 }
 
 declare type PrismaPgOptions = {

package/dist/index.d.ts

@@ -1,13 +1,12 @@
 import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
-import type { DriverAdapter } from '@prisma/driver-adapter-utils';
 import pg from 'pg';
-import type { Query } from '@prisma/driver-adapter-utils';
-import type { Queryable } from '@prisma/driver-adapter-utils';
-import type { Result } from '@prisma/driver-adapter-utils';
-import type { ResultSet } from '@prisma/driver-adapter-utils';
+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';
 
-declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements Queryable {
+declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
     protected readonly client: ClientT;
     readonly provider = "postgres";
     readonly adapterName: string;
@@ -15,26 +14,30 @@ declare class PgQueryable<ClientT extends StdClient | TransactionClient> impleme
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
-    queryRaw(query: Query): Promise<Result<ResultSet>>;
+    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: Query): Promise<Result<number>>;
+    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 DriverAdapter {
+export declare class PrismaPg extends PgQueryable<StdClient> implements SqlConnection {
     private options?;
-    constructor(client: pg.Pool, options?: PrismaPgOptions | undefined);
-    getConnectionInfo(): Result<ConnectionInfo>;
-    transactionContext(): Promise<Result<TransactionContext>>;
+    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>;
 }
 
 declare type PrismaPgOptions = {

package/dist/index.js

@@ -5,6 +5,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name2 in all)
     __defProp(target, name2, { get: all[name2], enumerable: true });
@@ -26,6 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/index.ts
 var index_exports = {};
@@ -77,12 +79,13 @@ var ArrayColumnType = {
 var _UnsupportedNativeDataType = class _UnsupportedNativeDataType extends Error {
   constructor(code) {
     super();
+    __publicField(this, "type");
     this.type = _UnsupportedNativeDataType.typeNames[code] || "Unknown";
     this.message = `Unsupported column type ${this.type}`;
   }
 };
 // map of type codes to type names
-_UnsupportedNativeDataType.typeNames = {
+__publicField(_UnsupportedNativeDataType, "typeNames", {
   16: "bool",
   17: "bytea",
   18: "char",
@@ -195,7 +198,7 @@ _UnsupportedNativeDataType.typeNames = {
   5078: "anycompatiblearray",
   5079: "anycompatiblenonarray",
   5080: "anycompatiblerange"
-};
+});
 var UnsupportedNativeDataType = _UnsupportedNativeDataType;
 function fieldToColumnType(fieldTypeId) {
   switch (fieldTypeId) {
@@ -374,8 +377,8 @@ var debug = (0, import_driver_adapter_utils2.Debug)("prisma:driver-adapter:pg");
 var PgQueryable = class {
   constructor(client) {
     this.client = client;
-    this.provider = "postgres";
-    this.adapterName = name;
+    __publicField(this, "provider", "postgres");
+    __publicField(this, "adapterName", name);
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters.
@@ -383,29 +386,25 @@ var PgQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const res = await this.performIO(query);
-    if (!res.ok) {
-      return (0, import_driver_adapter_utils2.err)(res.error);
-    }
-    const { fields, rows } = res.value;
+    const { fields, rows } = await this.performIO(query);
     const columnNames = fields.map((field) => field.name);
     let columnTypes = [];
     try {
       columnTypes = fields.map((field) => fieldToColumnType(field.dataTypeID));
     } catch (e) {
       if (e instanceof UnsupportedNativeDataType) {
-        return (0, import_driver_adapter_utils2.err)({
+        throw new import_driver_adapter_utils2.DriverAdapterError({
           kind: "UnsupportedNativeDataType",
           type: e.type
         });
       }
       throw e;
     }
-    return (0, import_driver_adapter_utils2.ok)({
+    return {
       columnNames,
       columnTypes,
       rows
-    });
+    };
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters and
@@ -415,7 +414,7 @@ var PgQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    return (await this.performIO(query)).map(({ rowCount: rowsAffected }) => rowsAffected ?? 0);
+    return (await this.performIO(query)).rowCount ?? 0;
   }
   /**
    * Run a query against the database, returning the result set.
@@ -453,23 +452,25 @@ var PgQueryable = class {
         },
         fixArrayBufferValues(values)
       );
-      return (0, import_driver_adapter_utils2.ok)(result);
+      return result;
     } catch (e) {
-      const error = e;
-      debug("Error in performIO: %O", error);
-      if (e && typeof e.code === "string" && typeof e.severity === "string" && typeof e.message === "string") {
-        return (0, import_driver_adapter_utils2.err)({
-          kind: "postgres",
-          code: e.code,
-          severity: e.severity,
-          message: e.message,
-          detail: e.detail,
-          column: e.column,
-          hint: e.hint
-        });
-      }
-      throw error;
+      this.onError(e);
+    }
+  }
+  onError(error) {
+    debug("Error in performIO: %O", error);
+    if (error && typeof error.code === "string" && typeof error.severity === "string" && typeof error.message === "string") {
+      throw new import_driver_adapter_utils2.DriverAdapterError({
+        kind: "postgres",
+        code: error.code,
+        severity: error.severity,
+        message: error.message,
+        detail: error.detail,
+        column: error.column,
+        hint: error.hint
+      });
     }
+    throw error;
   }
 };
 var PgTransaction = class extends PgQueryable {
@@ -480,12 +481,10 @@ var PgTransaction = class extends PgQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.client.release();
-    return (0, import_driver_adapter_utils2.ok)(void 0);
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.client.release();
-    return (0, import_driver_adapter_utils2.ok)(void 0);
   }
 };
 var PgTransactionContext = class extends PgQueryable {
@@ -499,12 +498,12 @@ var PgTransactionContext = class extends PgQueryable {
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return (0, import_driver_adapter_utils2.ok)(new PgTransaction(this.conn, options));
+    return new PgTransaction(this.conn, options);
   }
 };
 var PrismaPg = class extends PgQueryable {
-  constructor(client, options) {
-    if (!(client instanceof import_pg2.default.Pool)) {
+  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 })
@@ -513,15 +512,29 @@ const adapter = new PrismaPg(pool)
     }
     super(client);
     this.options = options;
+    this.release = release;
+  }
+  async executeScript(script) {
+    for (const stmt of script.split(";")) {
+      try {
+        await this.client.query(stmt);
+      } catch (error) {
+        this.onError(error);
+      }
+    }
   }
   getConnectionInfo() {
-    return (0, import_driver_adapter_utils2.ok)({
+    return {
       schemaName: this.options?.schema
-    });
+    };
   }
   async transactionContext() {
     const conn = await this.client.connect();
-    return (0, import_driver_adapter_utils2.ok)(new PgTransactionContext(conn));
+    return new PgTransactionContext(conn);
+  }
+  async dispose() {
+    await this.release?.();
+    return await this.client.end();
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -1,5 +1,9 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+
 // src/pg.ts
-import { Debug, err, ok } from "@prisma/driver-adapter-utils";
+import { Debug, DriverAdapterError } from "@prisma/driver-adapter-utils";
 import pg2 from "pg";
 
 // package.json
@@ -41,12 +45,13 @@ var ArrayColumnType = {
 var _UnsupportedNativeDataType = class _UnsupportedNativeDataType extends Error {
   constructor(code) {
     super();
+    __publicField(this, "type");
     this.type = _UnsupportedNativeDataType.typeNames[code] || "Unknown";
     this.message = `Unsupported column type ${this.type}`;
   }
 };
 // map of type codes to type names
-_UnsupportedNativeDataType.typeNames = {
+__publicField(_UnsupportedNativeDataType, "typeNames", {
   16: "bool",
   17: "bytea",
   18: "char",
@@ -159,7 +164,7 @@ _UnsupportedNativeDataType.typeNames = {
   5078: "anycompatiblearray",
   5079: "anycompatiblenonarray",
   5080: "anycompatiblerange"
-};
+});
 var UnsupportedNativeDataType = _UnsupportedNativeDataType;
 function fieldToColumnType(fieldTypeId) {
   switch (fieldTypeId) {
@@ -338,8 +343,8 @@ var debug = Debug("prisma:driver-adapter:pg");
 var PgQueryable = class {
   constructor(client) {
     this.client = client;
-    this.provider = "postgres";
-    this.adapterName = name;
+    __publicField(this, "provider", "postgres");
+    __publicField(this, "adapterName", name);
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters.
@@ -347,29 +352,25 @@ var PgQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const res = await this.performIO(query);
-    if (!res.ok) {
-      return err(res.error);
-    }
-    const { fields, rows } = res.value;
+    const { fields, rows } = await this.performIO(query);
     const columnNames = fields.map((field) => field.name);
     let columnTypes = [];
     try {
       columnTypes = fields.map((field) => fieldToColumnType(field.dataTypeID));
     } catch (e) {
       if (e instanceof UnsupportedNativeDataType) {
-        return err({
+        throw new DriverAdapterError({
           kind: "UnsupportedNativeDataType",
           type: e.type
         });
       }
       throw e;
     }
-    return ok({
+    return {
       columnNames,
       columnTypes,
       rows
-    });
+    };
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters and
@@ -379,7 +380,7 @@ var PgQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    return (await this.performIO(query)).map(({ rowCount: rowsAffected }) => rowsAffected ?? 0);
+    return (await this.performIO(query)).rowCount ?? 0;
   }
   /**
    * Run a query against the database, returning the result set.
@@ -417,23 +418,25 @@ var PgQueryable = class {
         },
         fixArrayBufferValues(values)
       );
-      return ok(result);
+      return result;
     } catch (e) {
-      const error = e;
-      debug("Error in performIO: %O", error);
-      if (e && typeof e.code === "string" && typeof e.severity === "string" && typeof e.message === "string") {
-        return err({
-          kind: "postgres",
-          code: e.code,
-          severity: e.severity,
-          message: e.message,
-          detail: e.detail,
-          column: e.column,
-          hint: e.hint
-        });
-      }
-      throw error;
+      this.onError(e);
+    }
+  }
+  onError(error) {
+    debug("Error in performIO: %O", error);
+    if (error && typeof error.code === "string" && typeof error.severity === "string" && typeof error.message === "string") {
+      throw new DriverAdapterError({
+        kind: "postgres",
+        code: error.code,
+        severity: error.severity,
+        message: error.message,
+        detail: error.detail,
+        column: error.column,
+        hint: error.hint
+      });
     }
+    throw error;
   }
 };
 var PgTransaction = class extends PgQueryable {
@@ -444,12 +447,10 @@ var PgTransaction = class extends PgQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.client.release();
-    return ok(void 0);
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.client.release();
-    return ok(void 0);
   }
 };
 var PgTransactionContext = class extends PgQueryable {
@@ -463,12 +464,12 @@ var PgTransactionContext = class extends PgQueryable {
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return ok(new PgTransaction(this.conn, options));
+    return new PgTransaction(this.conn, options);
   }
 };
 var PrismaPg = class extends PgQueryable {
-  constructor(client, options) {
-    if (!(client instanceof pg2.Pool)) {
+  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 })
@@ -477,15 +478,29 @@ const adapter = new PrismaPg(pool)
     }
     super(client);
     this.options = options;
+    this.release = release;
+  }
+  async executeScript(script) {
+    for (const stmt of script.split(";")) {
+      try {
+        await this.client.query(stmt);
+      } catch (error) {
+        this.onError(error);
+      }
+    }
   }
   getConnectionInfo() {
-    return ok({
+    return {
       schemaName: this.options?.schema
-    });
+    };
   }
   async transactionContext() {
     const conn = await this.client.connect();
-    return ok(new PgTransactionContext(conn));
+    return new PgTransactionContext(conn);
+  }
+  async dispose() {
+    await this.release?.();
+    return await this.client.end();
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "6.5.0-dev.7",
+  "version": "6.5.0-dev.70",
   "description": "Prisma's driver adapter for \"pg\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,16 +31,16 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "postgres-array": "3.0.2",
-    "@prisma/driver-adapter-utils": "6.5.0-dev.7"
+    "postgres-array": "3.0.3",
+    "@prisma/driver-adapter-utils": "6.5.0-dev.70"
   },
   "devDependencies": {
-    "@swc/core": "1.10.11",
+    "@swc/core": "1.11.5",
     "@swc/jest": "0.2.37",
-    "@types/pg": "8.11.6",
+    "@types/pg": "8.11.11",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
-    "pg": "8.11.5"
+    "pg": "8.13.3"
   },
   "peerDependencies": {
     "pg": "^8.11.3"