@prisma/adapter-planetscale 6.5.0-dev.24 → 6.5.0-dev.25

package/dist/index.d.mts

@@ -1,13 +1,12 @@
 import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
-import type { DriverAdapter } from '@prisma/driver-adapter-utils';
 import * as planetScale from '@planetscale/database';
-import type { Query } from '@prisma/driver-adapter-utils';
-import type { Queryable } from '@prisma/driver-adapter-utils';
-import type { Result } from '@prisma/driver-adapter-utils';
-import type { ResultSet } from '@prisma/driver-adapter-utils';
+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';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements Queryable {
+declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements SqlQueryable {
     protected client: ClientT;
     readonly provider = "mysql";
     readonly adapterName: string;
@@ -15,13 +14,13 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
-    queryRaw(query: Query): Promise<Result<ResultSet>>;
+    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: Query): Promise<Result<number>>;
+    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
@@ -30,10 +29,12 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
     private performIO;
 }
 
-export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements DriverAdapter {
+export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements SqlConnection {
     constructor(client: planetScale.Client);
-    getConnectionInfo(): Result<ConnectionInfo>;
-    transactionContext(): Promise<Result<TransactionContext>>;
+    executeScript(_script: string): Promise<void>;
+    getConnectionInfo(): ConnectionInfo;
+    transactionContext(): Promise<TransactionContext>;
+    dispose(): Promise<void>;
 }
 
 export { }

package/dist/index.d.ts

@@ -1,13 +1,12 @@
 import type { ConnectionInfo } from '@prisma/driver-adapter-utils';
-import type { DriverAdapter } from '@prisma/driver-adapter-utils';
 import * as planetScale from '@planetscale/database';
-import type { Query } from '@prisma/driver-adapter-utils';
-import type { Queryable } from '@prisma/driver-adapter-utils';
-import type { Result } from '@prisma/driver-adapter-utils';
-import type { ResultSet } from '@prisma/driver-adapter-utils';
+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';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements Queryable {
+declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements SqlQueryable {
     protected client: ClientT;
     readonly provider = "mysql";
     readonly adapterName: string;
@@ -15,13 +14,13 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
     /**
      * Execute a query given as SQL, interpolating the given parameters.
      */
-    queryRaw(query: Query): Promise<Result<ResultSet>>;
+    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: Query): Promise<Result<number>>;
+    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
@@ -30,10 +29,12 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
     private performIO;
 }
 
-export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements DriverAdapter {
+export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements SqlConnection {
     constructor(client: planetScale.Client);
-    getConnectionInfo(): Result<ConnectionInfo>;
-    transactionContext(): Promise<Result<TransactionContext>>;
+    executeScript(_script: string): Promise<void>;
+    getConnectionInfo(): ConnectionInfo;
+    transactionContext(): Promise<TransactionContext>;
+    dispose(): Promise<void>;
 }
 
 export { }

package/dist/index.js

@@ -155,16 +155,14 @@ var PlanetScaleQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const ioResult = await this.performIO(query);
-    return ioResult.map(({ fields, insertId: lastInsertId, rows }) => {
-      const columns = fields.map((field) => field.name);
-      return {
-        columnNames: columns,
-        columnTypes: fields.map((field) => fieldToColumnType(field.type)),
-        rows,
-        lastInsertId
-      };
-    });
+    const { fields, insertId: lastInsertId, rows } = await this.performIO(query);
+    const columns = fields.map((field) => field.name);
+    return {
+      columnNames: columns,
+      columnTypes: fields.map((field) => fieldToColumnType(field.type)),
+      rows,
+      lastInsertId
+    };
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters and
@@ -174,7 +172,7 @@ var PlanetScaleQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    return (await this.performIO(query)).map(({ rowsAffected }) => rowsAffected);
+    return (await this.performIO(query)).rowsAffected;
   }
   /**
    * Run a query against the database, returning the result set.
@@ -188,13 +186,13 @@ var PlanetScaleQueryable = class {
         as: "array",
         cast
       });
-      return (0, import_driver_adapter_utils2.ok)(result);
+      return result;
     } catch (e) {
       const error = e;
       if (error.name === "DatabaseError") {
         const parsed = parseErrorMessage(error.message);
         if (parsed) {
-          return (0, import_driver_adapter_utils2.err)({
+          throw new import_driver_adapter_utils2.DriverAdapterError({
             kind: "mysql",
             ...parsed
           });
@@ -230,12 +228,12 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.txDeferred.resolve();
-    return (0, import_driver_adapter_utils2.ok)(await this.txResultPromise);
+    return await this.txResultPromise;
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.txDeferred.reject(new RollbackError());
-    return (0, import_driver_adapter_utils2.ok)(await this.txResultPromise);
+    return await this.txResultPromise;
   }
 };
 var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
@@ -253,7 +251,7 @@ var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
       const txResultPromise = this.conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
-        resolve((0, import_driver_adapter_utils2.ok)(txWrapper));
+        resolve(txWrapper);
         return deferredPromise;
       }).catch((error) => {
         if (!(error instanceof RollbackError)) {
@@ -275,17 +273,22 @@ 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 (0, import_driver_adapter_utils2.ok)({
+    return {
       schemaName: dbName
-    });
+    };
   }
   async transactionContext() {
     const conn = this.client.connection();
     const ctx = new PlanetScaleTransactionContext(conn);
-    return (0, import_driver_adapter_utils2.ok)(ctx);
+    return ctx;
+  }
+  async dispose() {
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // src/planetscale.ts
 import * as planetScale from "@planetscale/database";
-import { Debug, err, ok } from "@prisma/driver-adapter-utils";
+import { Debug, DriverAdapterError } from "@prisma/driver-adapter-utils";
 
 // package.json
 var name = "@prisma/adapter-planetscale";
@@ -119,16 +119,14 @@ var PlanetScaleQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const ioResult = await this.performIO(query);
-    return ioResult.map(({ fields, insertId: lastInsertId, rows }) => {
-      const columns = fields.map((field) => field.name);
-      return {
-        columnNames: columns,
-        columnTypes: fields.map((field) => fieldToColumnType(field.type)),
-        rows,
-        lastInsertId
-      };
-    });
+    const { fields, insertId: lastInsertId, rows } = await this.performIO(query);
+    const columns = fields.map((field) => field.name);
+    return {
+      columnNames: columns,
+      columnTypes: fields.map((field) => fieldToColumnType(field.type)),
+      rows,
+      lastInsertId
+    };
   }
   /**
    * Execute a query given as SQL, interpolating the given parameters and
@@ -138,7 +136,7 @@ var PlanetScaleQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    return (await this.performIO(query)).map(({ rowsAffected }) => rowsAffected);
+    return (await this.performIO(query)).rowsAffected;
   }
   /**
    * Run a query against the database, returning the result set.
@@ -152,13 +150,13 @@ var PlanetScaleQueryable = class {
         as: "array",
         cast
       });
-      return ok(result);
+      return result;
     } catch (e) {
       const error = e;
       if (error.name === "DatabaseError") {
         const parsed = parseErrorMessage(error.message);
         if (parsed) {
-          return err({
+          throw new DriverAdapterError({
             kind: "mysql",
             ...parsed
           });
@@ -194,12 +192,12 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.txDeferred.resolve();
-    return ok(await this.txResultPromise);
+    return await this.txResultPromise;
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.txDeferred.reject(new RollbackError());
-    return ok(await this.txResultPromise);
+    return await this.txResultPromise;
   }
 };
 var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
@@ -217,7 +215,7 @@ var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
       const txResultPromise = this.conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
-        resolve(ok(txWrapper));
+        resolve(txWrapper);
         return deferredPromise;
       }).catch((error) => {
         if (!(error instanceof RollbackError)) {
@@ -239,17 +237,22 @@ 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 ok({
+    return {
       schemaName: dbName
-    });
+    };
   }
   async transactionContext() {
     const conn = this.client.connection();
     const ctx = new PlanetScaleTransactionContext(conn);
-    return ok(ctx);
+    return ctx;
+  }
+  async dispose() {
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-planetscale",
-  "version": "6.5.0-dev.24",
+  "version": "6.5.0-dev.25",
   "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.5.0-dev.24"
+    "@prisma/driver-adapter-utils": "6.5.0-dev.25"
   },
   "devDependencies": {
     "@planetscale/database": "1.18.0",