@prisma/adapter-pg 6.15.0-dev.3 → 6.15.0-dev.30

package/dist/index.d.mts

@@ -10,9 +10,10 @@ import type { Transaction } from '@prisma/driver-adapter-utils';
 
 declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
     protected readonly client: ClientT;
+    protected readonly pgOptions?: PrismaPgOptions | undefined;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(client: ClientT);
+    constructor(client: ClientT, pgOptions?: PrismaPgOptions | undefined);
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
@@ -44,9 +45,9 @@ export declare class PrismaPg implements SqlMigrationAwareDriverAdapterFactory {
 }
 
 declare class PrismaPgAdapter extends PgQueryable<StdClient> implements SqlDriverAdapter {
-    private options?;
+    protected readonly pgOptions?: PrismaPgOptions | undefined;
     private readonly release?;
-    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
+    constructor(client: StdClient, pgOptions?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
     startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
     executeScript(script: string): Promise<void>;
     getConnectionInfo(): ConnectionInfo;
@@ -58,10 +59,14 @@ declare type PrismaPgOptions = {
     schema?: string;
     disposeExternalPool?: boolean;
     onPoolError?: (err: Error) => void;
+    onConnectionError?: (err: Error) => void;
+    userDefinedTypeParser?: UserDefinedTypeParser;
 };
 
 declare type StdClient = pg.Pool;
 
 declare type TransactionClient = pg.PoolClient;
 
+declare type UserDefinedTypeParser = (oid: number, value: unknown, adapter: SqlQueryable) => Promise<unknown>;
+
 export { }

package/dist/index.d.ts

@@ -10,9 +10,10 @@ import type { Transaction } from '@prisma/driver-adapter-utils';
 
 declare class PgQueryable<ClientT extends StdClient | TransactionClient> implements SqlQueryable {
     protected readonly client: ClientT;
+    protected readonly pgOptions?: PrismaPgOptions | undefined;
     readonly provider = "postgres";
     readonly adapterName: string;
-    constructor(client: ClientT);
+    constructor(client: ClientT, pgOptions?: PrismaPgOptions | undefined);
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
@@ -44,9 +45,9 @@ export declare class PrismaPg implements SqlMigrationAwareDriverAdapterFactory {
 }
 
 declare class PrismaPgAdapter extends PgQueryable<StdClient> implements SqlDriverAdapter {
-    private options?;
+    protected readonly pgOptions?: PrismaPgOptions | undefined;
     private readonly release?;
-    constructor(client: StdClient, options?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
+    constructor(client: StdClient, pgOptions?: PrismaPgOptions | undefined, release?: (() => Promise<void>) | undefined);
     startTransaction(isolationLevel?: IsolationLevel): Promise<Transaction>;
     executeScript(script: string): Promise<void>;
     getConnectionInfo(): ConnectionInfo;
@@ -58,10 +59,14 @@ declare type PrismaPgOptions = {
     schema?: string;
     disposeExternalPool?: boolean;
     onPoolError?: (err: Error) => void;
+    onConnectionError?: (err: Error) => void;
+    userDefinedTypeParser?: UserDefinedTypeParser;
 };
 
 declare type StdClient = pg.Pool;
 
 declare type TransactionClient = pg.PoolClient;
 
+declare type UserDefinedTypeParser = (oid: number, value: unknown, adapter: SqlQueryable) => Promise<unknown>;
+
 export { }

package/dist/index.js

@@ -41,6 +41,9 @@ var import_pg2 = __toESM(require("pg"));
 // package.json
 var name = "@prisma/adapter-pg";
 
+// src/constants.ts
+var FIRST_NORMAL_OBJECT_ID = 16384;
+
 // src/conversion.ts
 var import_driver_adapter_utils = require("@prisma/driver-adapter-utils");
 var import_pg = __toESM(require("pg"));
@@ -282,7 +285,7 @@ function fieldToColumnType(fieldTypeId) {
     case ArrayColumnType.OID_ARRAY:
       return import_driver_adapter_utils.ColumnTypeEnum.Int64Array;
     default:
-      if (fieldTypeId >= 1e4) {
+      if (fieldTypeId >= FIRST_NORMAL_OBJECT_ID) {
         return import_driver_adapter_utils.ColumnTypeEnum.Text;
       }
       throw new UnsupportedNativeDataType(fieldTypeId);
@@ -358,20 +361,51 @@ var customParsers = {
   [ArrayColumnType.VARBIT_ARRAY]: normalize_array(normalizeBit),
   [ArrayColumnType.XML_ARRAY]: normalize_array(normalize_xml)
 };
-function fixArrayBufferValues(values) {
-  for (let i = 0; i < values.length; i++) {
-    const list = values[i];
-    if (!Array.isArray(list)) {
-      continue;
-    }
-    for (let j = 0; j < list.length; j++) {
-      const listItem = list[j];
-      if (ArrayBuffer.isView(listItem)) {
-        list[j] = Buffer.from(listItem.buffer, listItem.byteOffset, listItem.byteLength);
-      }
+function mapArg(arg, argType) {
+  if (arg === null) {
+    return null;
+  }
+  if (Array.isArray(arg) && argType.arity === "list") {
+    return arg.map((value) => mapArg(value, argType));
+  }
+  if (typeof arg === "string" && argType.scalarType === "datetime") {
+    arg = new Date(arg);
+  }
+  if (arg instanceof Date) {
+    switch (argType.dbType) {
+      case "TIME":
+      case "TIMETZ":
+        return formatTime(arg);
+      case "DATE":
+        return formatDate(arg);
+      default:
+        return formatDateTime(arg);
     }
   }
-  return values;
+  if (typeof arg === "string" && argType.scalarType === "bytes") {
+    return Buffer.from(arg, "base64");
+  }
+  if (Array.isArray(arg) && argType.scalarType === "bytes") {
+    return Buffer.from(arg);
+  }
+  if (ArrayBuffer.isView(arg)) {
+    return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
+  }
+  return arg;
+}
+function formatDateTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate()) + " " + pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
+function formatDate(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate());
+}
+function formatTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
 }
 
 // src/errors.ts
@@ -555,8 +589,9 @@ function isTlsError(error) {
 var types2 = import_pg2.default.types;
 var debug = (0, import_driver_adapter_utils2.Debug)("prisma:driver-adapter:pg");
 var PgQueryable = class {
-  constructor(client) {
+  constructor(client, pgOptions) {
     this.client = client;
+    this.pgOptions = pgOptions;
   }
   provider = "postgres";
   adapterName = name;
@@ -580,6 +615,17 @@ var PgQueryable = class {
       }
       throw e;
     }
+    const udtParser = this.pgOptions?.userDefinedTypeParser;
+    if (udtParser) {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        if (field.dataTypeID >= FIRST_NORMAL_OBJECT_ID && !Object.hasOwn(customParsers, field.dataTypeID)) {
+          for (let j = 0; j < rows.length; j++) {
+            rows[j][i] = await udtParser(field.dataTypeID, rows[j][i], this);
+          }
+        }
+      }
+    }
     return {
       columnNames,
       columnTypes,
@@ -602,12 +648,13 @@ var PgQueryable = class {
    * marked as unhealthy.
    */
   async performIO(query) {
-    const { sql, args: values } = query;
+    const { sql, args } = query;
+    const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
     try {
       const result = await this.client.query(
         {
           text: sql,
-          values: fixArrayBufferValues(values),
+          values,
           rowMode: "array",
           types: {
             // This is the error expected:
@@ -630,7 +677,7 @@ var PgQueryable = class {
             }
           }
         },
-        fixArrayBufferValues(values)
+        values
       );
       return result;
     } catch (e) {
@@ -643,9 +690,10 @@ var PgQueryable = class {
   }
 };
 var PgTransaction = class extends PgQueryable {
-  constructor(client, options) {
-    super(client);
+  constructor(client, options, pgOptions) {
+    super(client, pgOptions);
     this.options = options;
+    this.pgOptions = pgOptions;
   }
   async commit() {
     debug(`[js::commit]`);
@@ -657,9 +705,9 @@ var PgTransaction = class extends PgQueryable {
   }
 };
 var PrismaPgAdapter = class extends PgQueryable {
-  constructor(client, options, release) {
+  constructor(client, pgOptions, release) {
     super(client);
-    this.options = options;
+    this.pgOptions = pgOptions;
     this.release = release;
   }
   async startTransaction(isolationLevel) {
@@ -669,6 +717,10 @@ var PrismaPgAdapter = class extends PgQueryable {
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
     const conn = await this.client.connect().catch((error) => this.onError(error));
+    conn.on("error", (err) => {
+      debug(`Error from pool connection: ${err.message} %O`, err);
+      this.pgOptions?.onConnectionError?.(err);
+    });
     try {
       const tx = new PgTransaction(conn, options);
       await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
@@ -697,7 +749,7 @@ var PrismaPgAdapter = class extends PgQueryable {
   }
   getConnectionInfo() {
     return {
-      schemaName: this.options?.schema,
+      schemaName: this.pgOptions?.schema,
       supportsRelationJoins: true
     };
   }

package/dist/index.mjs

@@ -5,6 +5,9 @@ import pg2 from "pg";
 // package.json
 var name = "@prisma/adapter-pg";
 
+// src/constants.ts
+var FIRST_NORMAL_OBJECT_ID = 16384;
+
 // src/conversion.ts
 import { ColumnTypeEnum } from "@prisma/driver-adapter-utils";
 import pg from "pg";
@@ -246,7 +249,7 @@ function fieldToColumnType(fieldTypeId) {
     case ArrayColumnType.OID_ARRAY:
       return ColumnTypeEnum.Int64Array;
     default:
-      if (fieldTypeId >= 1e4) {
+      if (fieldTypeId >= FIRST_NORMAL_OBJECT_ID) {
         return ColumnTypeEnum.Text;
       }
       throw new UnsupportedNativeDataType(fieldTypeId);
@@ -322,20 +325,51 @@ var customParsers = {
   [ArrayColumnType.VARBIT_ARRAY]: normalize_array(normalizeBit),
   [ArrayColumnType.XML_ARRAY]: normalize_array(normalize_xml)
 };
-function fixArrayBufferValues(values) {
-  for (let i = 0; i < values.length; i++) {
-    const list = values[i];
-    if (!Array.isArray(list)) {
-      continue;
-    }
-    for (let j = 0; j < list.length; j++) {
-      const listItem = list[j];
-      if (ArrayBuffer.isView(listItem)) {
-        list[j] = Buffer.from(listItem.buffer, listItem.byteOffset, listItem.byteLength);
-      }
+function mapArg(arg, argType) {
+  if (arg === null) {
+    return null;
+  }
+  if (Array.isArray(arg) && argType.arity === "list") {
+    return arg.map((value) => mapArg(value, argType));
+  }
+  if (typeof arg === "string" && argType.scalarType === "datetime") {
+    arg = new Date(arg);
+  }
+  if (arg instanceof Date) {
+    switch (argType.dbType) {
+      case "TIME":
+      case "TIMETZ":
+        return formatTime(arg);
+      case "DATE":
+        return formatDate(arg);
+      default:
+        return formatDateTime(arg);
     }
   }
-  return values;
+  if (typeof arg === "string" && argType.scalarType === "bytes") {
+    return Buffer.from(arg, "base64");
+  }
+  if (Array.isArray(arg) && argType.scalarType === "bytes") {
+    return Buffer.from(arg);
+  }
+  if (ArrayBuffer.isView(arg)) {
+    return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
+  }
+  return arg;
+}
+function formatDateTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate()) + " " + pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
+}
+function formatDate(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1) + "-" + pad(date.getUTCDate());
+}
+function formatTime(date) {
+  const pad = (n, z = 2) => String(n).padStart(z, "0");
+  const ms = date.getUTCMilliseconds();
+  return pad(date.getUTCHours()) + ":" + pad(date.getUTCMinutes()) + ":" + pad(date.getUTCSeconds()) + (ms ? "." + String(ms).padStart(3, "0") : "");
 }
 
 // src/errors.ts
@@ -519,8 +553,9 @@ function isTlsError(error) {
 var types2 = pg2.types;
 var debug = Debug("prisma:driver-adapter:pg");
 var PgQueryable = class {
-  constructor(client) {
+  constructor(client, pgOptions) {
     this.client = client;
+    this.pgOptions = pgOptions;
   }
   provider = "postgres";
   adapterName = name;
@@ -544,6 +579,17 @@ var PgQueryable = class {
       }
       throw e;
     }
+    const udtParser = this.pgOptions?.userDefinedTypeParser;
+    if (udtParser) {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        if (field.dataTypeID >= FIRST_NORMAL_OBJECT_ID && !Object.hasOwn(customParsers, field.dataTypeID)) {
+          for (let j = 0; j < rows.length; j++) {
+            rows[j][i] = await udtParser(field.dataTypeID, rows[j][i], this);
+          }
+        }
+      }
+    }
     return {
       columnNames,
       columnTypes,
@@ -566,12 +612,13 @@ var PgQueryable = class {
    * marked as unhealthy.
    */
   async performIO(query) {
-    const { sql, args: values } = query;
+    const { sql, args } = query;
+    const values = args.map((arg, i) => mapArg(arg, query.argTypes[i]));
     try {
       const result = await this.client.query(
         {
           text: sql,
-          values: fixArrayBufferValues(values),
+          values,
           rowMode: "array",
           types: {
             // This is the error expected:
@@ -594,7 +641,7 @@ var PgQueryable = class {
             }
           }
         },
-        fixArrayBufferValues(values)
+        values
       );
       return result;
     } catch (e) {
@@ -607,9 +654,10 @@ var PgQueryable = class {
   }
 };
 var PgTransaction = class extends PgQueryable {
-  constructor(client, options) {
-    super(client);
+  constructor(client, options, pgOptions) {
+    super(client, pgOptions);
     this.options = options;
+    this.pgOptions = pgOptions;
   }
   async commit() {
     debug(`[js::commit]`);
@@ -621,9 +669,9 @@ var PgTransaction = class extends PgQueryable {
   }
 };
 var PrismaPgAdapter = class extends PgQueryable {
-  constructor(client, options, release) {
+  constructor(client, pgOptions, release) {
     super(client);
-    this.options = options;
+    this.pgOptions = pgOptions;
     this.release = release;
   }
   async startTransaction(isolationLevel) {
@@ -633,6 +681,10 @@ var PrismaPgAdapter = class extends PgQueryable {
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
     const conn = await this.client.connect().catch((error) => this.onError(error));
+    conn.on("error", (err) => {
+      debug(`Error from pool connection: ${err.message} %O`, err);
+      this.pgOptions?.onConnectionError?.(err);
+    });
     try {
       const tx = new PgTransaction(conn, options);
       await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });
@@ -661,7 +713,7 @@ var PrismaPgAdapter = class extends PgQueryable {
   }
   getConnectionInfo() {
     return {
-      schemaName: this.options?.schema,
+      schemaName: this.pgOptions?.schema,
       supportsRelationJoins: true
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "6.15.0-dev.3",
+  "version": "6.15.0-dev.30",
   "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.15.0-dev.3"
+    "@prisma/driver-adapter-utils": "6.15.0-dev.30"
   },
   "devDependencies": {
     "@swc/core": "1.11.5",