@prisma/adapter-pg 7.2.0 → 7.3.0-integration-prisma6-fix-cloudflare-engine.1

package/README.md

@@ -8,7 +8,7 @@ This package contains the driver adapter for Prisma ORM that enables usage of th
 
 ## Usage
 
-This section explains how you can use it with Prisma ORM and the `@prisma/adapter-pg` driver adapter. Be sure that the `DATABASE_URL` environment variable is set to your PostgreSQL connection string (e.g. loaded using `dotenv` from a `.env` file).
+This section explains how you can use it with Prisma ORM and the `@prisma/adapter-pg` driver adapter. Be sure that the `DATABASE_URL` environment variable is set to your PostgreSQL connection string (e.g. in a `.env` file).
 
 ### 1. Install the dependencies
 

package/dist/index.js

@@ -50,9 +50,6 @@ var import_pg = __toESM(require("pg"));
 var import_postgres_array = require("postgres-array");
 var { types } = import_pg.default;
 var { builtins: ScalarColumnType, getTypeParser } = types;
-var AdditionalScalarColumnType = {
-  NAME: 19
-};
 var ArrayColumnType = {
   BIT_ARRAY: 1561,
   BOOL_ARRAY: 1e3,
@@ -243,7 +240,6 @@ function fieldToColumnType(fieldTypeId) {
     case ScalarColumnType.INET:
     case ScalarColumnType.CIDR:
     case ScalarColumnType.XML:
-    case AdditionalScalarColumnType.NAME:
       return import_driver_adapter_utils.ColumnTypeEnum.Text;
     case ScalarColumnType.BYTEA:
       return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
@@ -325,10 +321,18 @@ function normalize_xml(xml) {
 function toJson(json) {
   return json;
 }
+function encodeBuffer(buffer) {
+  return Array.from(new Uint8Array(buffer));
+}
 var parsePgBytes = getTypeParser(ScalarColumnType.BYTEA);
-var normalizeByteaArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
+var parseBytesArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
+function normalizeByteaArray(serializedBytesArray) {
+  const buffers = parseBytesArray(serializedBytesArray);
+  return buffers.map((buf) => buf ? encodeBuffer(buf) : null);
+}
 function convertBytes(serializedBytes) {
-  return parsePgBytes(serializedBytes);
+  const buffer = parsePgBytes(serializedBytes);
+  return encodeBuffer(buffer);
 }
 function normalizeBit(bit) {
   return bit;
@@ -381,8 +385,11 @@ function mapArg(arg, argType) {
   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 new Uint8Array(arg.buffer, arg.byteOffset, arg.byteLength);
+    return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
   }
   return arg;
 }
@@ -464,11 +471,6 @@ function mapDriverError(error) {
         kind: "ValueOutOfRange",
         cause: error.message
       };
-    case "22P02":
-      return {
-        kind: "InvalidInputValue",
-        message: error.message
-      };
     case "23505": {
       const fields = error.detail?.match(/Key \(([^)]+)\)/)?.at(1)?.split(", ");
       return {

package/dist/index.mjs

@@ -14,9 +14,6 @@ import pg from "pg";
 import { parse as parseArray } from "postgres-array";
 var { types } = pg;
 var { builtins: ScalarColumnType, getTypeParser } = types;
-var AdditionalScalarColumnType = {
-  NAME: 19
-};
 var ArrayColumnType = {
   BIT_ARRAY: 1561,
   BOOL_ARRAY: 1e3,
@@ -207,7 +204,6 @@ function fieldToColumnType(fieldTypeId) {
     case ScalarColumnType.INET:
     case ScalarColumnType.CIDR:
     case ScalarColumnType.XML:
-    case AdditionalScalarColumnType.NAME:
       return ColumnTypeEnum.Text;
     case ScalarColumnType.BYTEA:
       return ColumnTypeEnum.Bytes;
@@ -289,10 +285,18 @@ function normalize_xml(xml) {
 function toJson(json) {
   return json;
 }
+function encodeBuffer(buffer) {
+  return Array.from(new Uint8Array(buffer));
+}
 var parsePgBytes = getTypeParser(ScalarColumnType.BYTEA);
-var normalizeByteaArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
+var parseBytesArray = getTypeParser(ArrayColumnType.BYTEA_ARRAY);
+function normalizeByteaArray(serializedBytesArray) {
+  const buffers = parseBytesArray(serializedBytesArray);
+  return buffers.map((buf) => buf ? encodeBuffer(buf) : null);
+}
 function convertBytes(serializedBytes) {
-  return parsePgBytes(serializedBytes);
+  const buffer = parsePgBytes(serializedBytes);
+  return encodeBuffer(buffer);
 }
 function normalizeBit(bit) {
   return bit;
@@ -345,8 +349,11 @@ function mapArg(arg, argType) {
   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 new Uint8Array(arg.buffer, arg.byteOffset, arg.byteLength);
+    return Buffer.from(arg.buffer, arg.byteOffset, arg.byteLength);
   }
   return arg;
 }
@@ -428,11 +435,6 @@ function mapDriverError(error) {
         kind: "ValueOutOfRange",
         cause: error.message
       };
-    case "22P02":
-      return {
-        kind: "InvalidInputValue",
-        message: error.message
-      };
     case "23505": {
       const fields = error.detail?.match(/Key \(([^)]+)\)/)?.at(1)?.split(", ");
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "7.2.0",
+  "version": "7.3.0-integration-prisma6-fix-cloudflare-engine.1",
   "description": "Prisma's driver adapter for \"pg\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,13 +31,13 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "pg": "^8.16.3",
     "postgres-array": "3.0.4",
-    "@prisma/driver-adapter-utils": "7.2.0"
+    "pg": "^8.11.3",
+    "@prisma/driver-adapter-utils": "7.3.0-integration-prisma6-fix-cloudflare-engine.1"
   },
   "devDependencies": {
     "@types/pg": "8.11.11",
-    "@prisma/debug": "7.2.0"
+    "@prisma/debug": "7.3.0-integration-prisma6-fix-cloudflare-engine.1"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",