fix: additions for prisma 6.17 and engineType = "client" compat (#39)

Author: jacek-prisma

package.json

@@ -34,7 +34,7 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@prisma/driver-adapter-utils": "6.12.0"
+    "@prisma/driver-adapter-utils": "6.17.0"
   },
   "devDependencies": {
     "@tidbcloud/serverless": "^0.1.0",

pnpm-lock.yaml

@@ -1,4 +1,8 @@
-import { ColumnTypeEnum, type ColumnType } from "@prisma/driver-adapter-utils";
+import {
+  ArgType,
+  ColumnTypeEnum,
+  type ColumnType,
+} from "@prisma/driver-adapter-utils";
 
 export type TiDBCloudColumnType =
   | "NULL"
@@ -117,3 +121,90 @@ function hexToUint8Array(hexString: string): Uint8Array {
   }
   return uint8Array;
 }
+
+export function mapArg<A>(
+  arg: A | Date,
+  argType: ArgType
+): null | BigInt | string | Uint8Array | A {
+  if (arg === null) {
+    return null;
+  }
+
+  if (typeof arg === "string" && argType.scalarType === "bigint") {
+    return BigInt(arg);
+  }
+
+  if (typeof arg === "string" && argType.scalarType === "datetime") {
+    arg = new Date(arg);
+  }
+
+  if (arg instanceof Date) {
+    switch (argType.dbType) {
+      case "TIME":
+      case "TIME2":
+        return formatTime(arg);
+      case "DATE":
+      case "NEWDATE":
+        return formatDate(arg);
+      default:
+        return formatDateTime(arg);
+    }
+  }
+
+  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: Date): string {
+  const pad = (n: number, 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: Date): string {
+  const pad = (n: number, z = 2) => String(n).padStart(z, "0");
+  return (
+    date.getUTCFullYear() +
+    "-" +
+    pad(date.getUTCMonth() + 1) +
+    "-" +
+    pad(date.getUTCDate())
+  );
+}
+
+function formatTime(date: Date): string {
+  const pad = (n: number, 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/conversion.ts

@@ -15,6 +15,7 @@ import {
   type TiDBCloudColumnType,
   fieldToColumnType,
   customDecoder,
+  mapArg,
 } from "./conversion";
 import { name as packageName } from "../package.json";
 
@@ -89,11 +90,15 @@ class TiDBCloudQueryable<ClientT extends TiDBCloud.Connection | TiDBCloud.Tx>
     const { sql, args: values } = query;
 
     try {
-      const result = await this.client.execute(sql, values, {
-        arrayMode: true,
-        fullResult: true,
-        decoders: customDecoder,
-      });
+      const result = await this.client.execute(
+        sql,
+        values.map((val, i) => mapArg(val, query.argTypes[i])),
+        {
+          arrayMode: true,
+          fullResult: true,
+          decoders: customDecoder,
+        }
+      );
       return result as TiDBCloud.FullResult;
     } catch (e) {
       const error = e as Error;