@prisma/adapter-planetscale 6.6.0-dev.32 → 6.6.0-dev.34

package/README.md

@@ -50,7 +50,6 @@ Update your Prisma Client instance to use the PlanetsScale serverless driver:
 
 ```ts
 // Import needed packages
-import { Client } from '@planetscale/database'
 import { PrismaPlanetScale } from '@prisma/adapter-planetscale'
 import { PrismaClient } from '@prisma/client'
 import { fetch as undiciFetch } from 'undici'
@@ -59,8 +58,7 @@ import { fetch as undiciFetch } from 'undici'
 const connectionString = `${process.env.DATABASE_URL}`
 
 // Init prisma client
-const client = new Client({ url: connectionString, fetch: undiciFetch })
-const adapter = new PrismaPlanetScale(client)
+const adapter = new PrismaPlanetScale({ url: connectionString, fetch: undiciFetch })
 const prisma = new PrismaClient({ adapter })
 
 // Use Prisma Client as normal

package/dist/index.d.mts

@@ -1,40 +1,13 @@
-import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import * as planetScale from '@planetscale/database';
-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';
+import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import type { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements SqlQueryable {
-    protected client: ClientT;
+export declare class PrismaPlanetScale implements SqlDriverAdapterFactory {
+    private readonly config;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(client: ClientT);
-    /**
-     * Execute a query given as SQL, interpolating the given parameters.
-     */
-    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: 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;
-}
-
-export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements SqlConnection {
-    constructor(client: planetScale.Client);
-    executeScript(_script: string): Promise<void>;
-    getConnectionInfo(): ConnectionInfo;
-    transactionContext(): Promise<TransactionContext>;
-    dispose(): Promise<void>;
+    constructor(config: planetScale.Config);
+    connect(): Promise<SqlDriverAdapter>;
 }
 
 export { }

package/dist/index.d.ts

@@ -1,40 +1,13 @@
-import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import * as planetScale from '@planetscale/database';
-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';
+import type { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
+import type { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements SqlQueryable {
-    protected client: ClientT;
+export declare class PrismaPlanetScale implements SqlDriverAdapterFactory {
+    private readonly config;
     readonly provider = "mysql";
     readonly adapterName: string;
-    constructor(client: ClientT);
-    /**
-     * Execute a query given as SQL, interpolating the given parameters.
-     */
-    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: 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;
-}
-
-export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements SqlConnection {
-    constructor(client: planetScale.Client);
-    executeScript(_script: string): Promise<void>;
-    getConnectionInfo(): ConnectionInfo;
-    transactionContext(): Promise<TransactionContext>;
-    dispose(): Promise<void>;
+    constructor(config: planetScale.Config);
+    connect(): Promise<SqlDriverAdapter>;
 }
 
 export { }

package/dist/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  PrismaPlanetScale: () => PrismaPlanetScale
+  PrismaPlanetScale: () => PrismaPlanetScaleAdapterFactory
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -189,20 +189,23 @@ var PlanetScaleQueryable = class {
       return result;
     } catch (e) {
       const error = e;
-      if (error.name === "DatabaseError") {
-        const parsed = parseErrorMessage(error.message);
-        if (parsed) {
-          throw new import_driver_adapter_utils2.DriverAdapterError({
-            kind: "mysql",
-            ...parsed
-          });
-        }
-      }
-      debug("Error in performIO: %O", error);
-      throw error;
+      onError(error);
     }
   }
 };
+function onError(error) {
+  if (error.name === "DatabaseError") {
+    const parsed = parseErrorMessage(error.message);
+    if (parsed) {
+      throw new import_driver_adapter_utils2.DriverAdapterError({
+        kind: "mysql",
+        ...parsed
+      });
+    }
+  }
+  debug("Error in performIO: %O", error);
+  throw error;
+}
 function parseErrorMessage(message) {
   const regex = /^(.*) \(errno (\d+)\) \(sqlstate ([A-Z0-9]+)\)/;
   const match = message.match(regex);
@@ -236,19 +239,35 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
     return await this.txResultPromise;
   }
 };
-var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
-  constructor(conn) {
-    super(conn);
-    this.conn = conn;
+var PrismaPlanetScaleAdapter = class extends PlanetScaleQueryable {
+  constructor(client) {
+    super(client);
+  }
+  executeScript(_script) {
+    throw new Error("Not implemented yet");
   }
-  async startTransaction() {
+  getConnectionInfo() {
+    const url = this.client.connection()["url"];
+    const dbName = new URL(url).pathname.slice(1);
+    return {
+      schemaName: dbName
+    };
+  }
+  async startTransaction(isolationLevel) {
     const options = {
       usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
+    const conn = this.client.connection();
+    if (isolationLevel) {
+      await conn.execute(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`).catch((error) => onError(error));
+    }
+    return this.startTransactionInner(conn, options);
+  }
+  async startTransactionInner(conn, options) {
     return new Promise((resolve, reject) => {
-      const txResultPromise = this.conn.transaction(async (tx) => {
+      const txResultPromise = conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
         resolve(txWrapper);
@@ -261,34 +280,17 @@ var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
       });
     });
   }
-};
-var PrismaPlanetScale = class extends PlanetScaleQueryable {
-  constructor(client) {
-    if (!(client instanceof planetScale.Client)) {
-      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
-import { Client } from '@planetscale/database'
-const client = new Client({ url })
-const adapter = new PrismaPlanetScale(client)
-`);
-    }
-    super(client);
-  }
-  executeScript(_script) {
-    throw new Error("Not implemented yet");
-  }
-  getConnectionInfo() {
-    const url = this.client.connection()["url"];
-    const dbName = new URL(url).pathname.slice(1);
-    return {
-      schemaName: dbName
-    };
+  async dispose() {
   }
-  async transactionContext() {
-    const conn = this.client.connection();
-    const ctx = new PlanetScaleTransactionContext(conn);
-    return ctx;
+};
+var PrismaPlanetScaleAdapterFactory = class {
+  constructor(config) {
+    this.config = config;
   }
-  async dispose() {
+  provider = "mysql";
+  adapterName = name;
+  async connect() {
+    return new PrismaPlanetScaleAdapter(new planetScale.Client(this.config));
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -153,20 +153,23 @@ var PlanetScaleQueryable = class {
       return result;
     } catch (e) {
       const error = e;
-      if (error.name === "DatabaseError") {
-        const parsed = parseErrorMessage(error.message);
-        if (parsed) {
-          throw new DriverAdapterError({
-            kind: "mysql",
-            ...parsed
-          });
-        }
-      }
-      debug("Error in performIO: %O", error);
-      throw error;
+      onError(error);
     }
   }
 };
+function onError(error) {
+  if (error.name === "DatabaseError") {
+    const parsed = parseErrorMessage(error.message);
+    if (parsed) {
+      throw new DriverAdapterError({
+        kind: "mysql",
+        ...parsed
+      });
+    }
+  }
+  debug("Error in performIO: %O", error);
+  throw error;
+}
 function parseErrorMessage(message) {
   const regex = /^(.*) \(errno (\d+)\) \(sqlstate ([A-Z0-9]+)\)/;
   const match = message.match(regex);
@@ -200,19 +203,35 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
     return await this.txResultPromise;
   }
 };
-var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
-  constructor(conn) {
-    super(conn);
-    this.conn = conn;
+var PrismaPlanetScaleAdapter = class extends PlanetScaleQueryable {
+  constructor(client) {
+    super(client);
+  }
+  executeScript(_script) {
+    throw new Error("Not implemented yet");
   }
-  async startTransaction() {
+  getConnectionInfo() {
+    const url = this.client.connection()["url"];
+    const dbName = new URL(url).pathname.slice(1);
+    return {
+      schemaName: dbName
+    };
+  }
+  async startTransaction(isolationLevel) {
     const options = {
       usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
+    const conn = this.client.connection();
+    if (isolationLevel) {
+      await conn.execute(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel}`).catch((error) => onError(error));
+    }
+    return this.startTransactionInner(conn, options);
+  }
+  async startTransactionInner(conn, options) {
     return new Promise((resolve, reject) => {
-      const txResultPromise = this.conn.transaction(async (tx) => {
+      const txResultPromise = conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
         resolve(txWrapper);
@@ -225,36 +244,19 @@ var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
       });
     });
   }
-};
-var PrismaPlanetScale = class extends PlanetScaleQueryable {
-  constructor(client) {
-    if (!(client instanceof planetScale.Client)) {
-      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
-import { Client } from '@planetscale/database'
-const client = new Client({ url })
-const adapter = new PrismaPlanetScale(client)
-`);
-    }
-    super(client);
-  }
-  executeScript(_script) {
-    throw new Error("Not implemented yet");
-  }
-  getConnectionInfo() {
-    const url = this.client.connection()["url"];
-    const dbName = new URL(url).pathname.slice(1);
-    return {
-      schemaName: dbName
-    };
+  async dispose() {
   }
-  async transactionContext() {
-    const conn = this.client.connection();
-    const ctx = new PlanetScaleTransactionContext(conn);
-    return ctx;
+};
+var PrismaPlanetScaleAdapterFactory = class {
+  constructor(config) {
+    this.config = config;
   }
-  async dispose() {
+  provider = "mysql";
+  adapterName = name;
+  async connect() {
+    return new PrismaPlanetScaleAdapter(new planetScale.Client(this.config));
   }
 };
 export {
-  PrismaPlanetScale
+  PrismaPlanetScaleAdapterFactory as PrismaPlanetScale
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-planetscale",
-  "version": "6.6.0-dev.32",
+  "version": "6.6.0-dev.34",
   "description": "Prisma's driver adapter for \"@planetscale/database\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@prisma/driver-adapter-utils": "6.6.0-dev.32"
+    "@prisma/driver-adapter-utils": "6.6.0-dev.34"
   },
   "devDependencies": {
     "@planetscale/database": "1.19.0",