@prisma/adapter-pg 6.15.0-dev.1 → 6.15.0-dev.11

package/dist/index.d.mts

@@ -58,6 +58,7 @@ declare type PrismaPgOptions = {
     schema?: string;
     disposeExternalPool?: boolean;
     onPoolError?: (err: Error) => void;
+    onConnectionError?: (err: Error) => void;
 };
 
 declare type StdClient = pg.Pool;

package/dist/index.d.ts

@@ -58,6 +58,7 @@ declare type PrismaPgOptions = {
     schema?: string;
     disposeExternalPool?: boolean;
     onPoolError?: (err: Error) => void;
+    onConnectionError?: (err: Error) => void;
 };
 
 declare type StdClient = pg.Pool;

package/dist/index.js

@@ -358,20 +358,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
@@ -602,12 +633,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 +662,7 @@ var PgQueryable = class {
             }
           }
         },
-        fixArrayBufferValues(values)
+        values
       );
       return result;
     } catch (e) {
@@ -669,6 +701,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.options?.onConnectionError?.(err);
+    });
     try {
       const tx = new PgTransaction(conn, options);
       await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });

package/dist/index.mjs

@@ -322,20 +322,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
@@ -566,12 +597,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 +626,7 @@ var PgQueryable = class {
             }
           }
         },
-        fixArrayBufferValues(values)
+        values
       );
       return result;
     } catch (e) {
@@ -633,6 +665,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.options?.onConnectionError?.(err);
+    });
     try {
       const tx = new PgTransaction(conn, options);
       await tx.executeRaw({ sql: "BEGIN", args: [], argTypes: [] });

package/package.json

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