@prisma/adapter-mssql 6.10.0-dev.24 → 6.10.0-dev.27

package/dist/index.d.mts

@@ -1,13 +1,18 @@
-import * as sql from 'mssql';
+import sql from 'mssql';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
 export declare class PrismaMssql implements SqlDriverAdapterFactory {
     private readonly config;
+    private readonly options?;
     readonly provider = "sqlserver";
     readonly adapterName: string;
-    constructor(config: sql.config);
+    constructor(config: sql.config, options?: PrismaMssqlOptions | undefined);
     connect(): Promise<SqlDriverAdapter>;
 }
 
+declare type PrismaMssqlOptions = {
+    schema?: string;
+};
+
 export { }

package/dist/index.d.ts

@@ -1,13 +1,18 @@
-import * as sql from 'mssql';
+import sql from 'mssql';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 
 export declare class PrismaMssql implements SqlDriverAdapterFactory {
     private readonly config;
+    private readonly options?;
     readonly provider = "sqlserver";
     readonly adapterName: string;
-    constructor(config: sql.config);
+    constructor(config: sql.config, options?: PrismaMssqlOptions | undefined);
     connect(): Promise<SqlDriverAdapter>;
 }
 
+declare type PrismaMssqlOptions = {
+    schema?: string;
+};
+
 export { }

package/dist/index.js

@@ -37,75 +37,75 @@ module.exports = __toCommonJS(index_exports);
 // src/mssql.ts
 var import_driver_adapter_utils2 = require("@prisma/driver-adapter-utils");
 var import_async_mutex = require("async-mutex");
-var sql2 = __toESM(require("mssql"));
+var import_mssql2 = __toESM(require("mssql"));
 
 // package.json
 var name = "@prisma/adapter-mssql";
 
 // src/conversion.ts
 var import_driver_adapter_utils = require("@prisma/driver-adapter-utils");
-var sql = __toESM(require("mssql"));
+var import_mssql = __toESM(require("mssql"));
 function mapColumnType(col) {
   switch (col.type) {
-    case sql.VarChar:
-    case sql.Char:
-    case sql.NVarChar:
-    case sql.NChar:
-    case sql.Text:
-    case sql.NText:
-    case sql.Xml:
+    case import_mssql.default.VarChar:
+    case import_mssql.default.Char:
+    case import_mssql.default.NVarChar:
+    case import_mssql.default.NChar:
+    case import_mssql.default.Text:
+    case import_mssql.default.NText:
+    case import_mssql.default.Xml:
       return import_driver_adapter_utils.ColumnTypeEnum.Text;
-    case sql.Bit:
+    case import_mssql.default.Bit:
       return import_driver_adapter_utils.ColumnTypeEnum.Boolean;
-    case sql.TinyInt:
-    case sql.SmallInt:
-    case sql.Int:
+    case import_mssql.default.TinyInt:
+    case import_mssql.default.SmallInt:
+    case import_mssql.default.Int:
       return import_driver_adapter_utils.ColumnTypeEnum.Int32;
-    case sql.BigInt:
+    case import_mssql.default.BigInt:
       return import_driver_adapter_utils.ColumnTypeEnum.Int64;
-    case sql.DateTime2:
-    case sql.SmallDateTime:
-    case sql.DateTime:
-    case sql.DateTimeOffset:
+    case import_mssql.default.DateTime2:
+    case import_mssql.default.SmallDateTime:
+    case import_mssql.default.DateTime:
+    case import_mssql.default.DateTimeOffset:
       return import_driver_adapter_utils.ColumnTypeEnum.DateTime;
-    case sql.Real:
+    case import_mssql.default.Real:
       return import_driver_adapter_utils.ColumnTypeEnum.Float;
-    case sql.Float:
-    case sql.Money:
-    case sql.SmallMoney:
+    case import_mssql.default.Float:
+    case import_mssql.default.Money:
+    case import_mssql.default.SmallMoney:
       return import_driver_adapter_utils.ColumnTypeEnum.Double;
-    case sql.UniqueIdentifier:
+    case import_mssql.default.UniqueIdentifier:
       return import_driver_adapter_utils.ColumnTypeEnum.Uuid;
-    case sql.Decimal:
-    case sql.Numeric:
+    case import_mssql.default.Decimal:
+    case import_mssql.default.Numeric:
       return import_driver_adapter_utils.ColumnTypeEnum.Numeric;
-    case sql.Date:
+    case import_mssql.default.Date:
       return import_driver_adapter_utils.ColumnTypeEnum.Date;
-    case sql.Time:
+    case import_mssql.default.Time:
       return import_driver_adapter_utils.ColumnTypeEnum.Time;
-    case sql.VarBinary:
-    case sql.Binary:
-    case sql.Image:
+    case import_mssql.default.VarBinary:
+    case import_mssql.default.Binary:
+    case import_mssql.default.Image:
       return import_driver_adapter_utils.ColumnTypeEnum.Bytes;
     default:
       throw new import_driver_adapter_utils.DriverAdapterError({
         kind: "UnsupportedNativeDataType",
-        type: `${col.type["constructor"].name}`
+        type: col["udt"]?.name ?? "N/A"
       });
   }
 }
 function mapIsolationLevel(level) {
   switch (level) {
     case "READ COMMITTED":
-      return sql.ISOLATION_LEVEL.READ_COMMITTED;
+      return import_mssql.default.ISOLATION_LEVEL.READ_COMMITTED;
     case "READ UNCOMMITTED":
-      return sql.ISOLATION_LEVEL.READ_UNCOMMITTED;
+      return import_mssql.default.ISOLATION_LEVEL.READ_UNCOMMITTED;
     case "REPEATABLE READ":
-      return sql.ISOLATION_LEVEL.REPEATABLE_READ;
+      return import_mssql.default.ISOLATION_LEVEL.REPEATABLE_READ;
     case "SERIALIZABLE":
-      return sql.ISOLATION_LEVEL.SERIALIZABLE;
+      return import_mssql.default.ISOLATION_LEVEL.SERIALIZABLE;
     case "SNAPSHOT":
-      return sql.ISOLATION_LEVEL.SNAPSHOT;
+      return import_mssql.default.ISOLATION_LEVEL.SNAPSHOT;
     default:
       throw new import_driver_adapter_utils.DriverAdapterError({
         kind: "InvalidIsolationLevel",
@@ -125,14 +125,23 @@ function mapArg(arg) {
   }
   return arg;
 }
-function mapRow(row) {
-  return row.map((value) => {
+function mapRow(row, columns) {
+  return row.map((value, i) => {
     if (value instanceof Date) {
+      if (columns?.[i]?.type === import_mssql.default.Time) {
+        return value.toISOString().split("T").at(1)?.replace("Z", "");
+      }
       return value.toISOString();
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
     }
+    if (typeof value === "string" && columns?.[i].type === import_mssql.default.UniqueIdentifier) {
+      return value.toLowerCase();
+    }
+    if (typeof value === "boolean" && columns?.[i]?.type === import_mssql.default.Bit) {
+      return value ? 1 : 0;
+    }
     return value;
   });
 }
@@ -264,11 +273,12 @@ var MssqlQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const { recordset, columns } = await this.performIO(query);
+    const { recordset, columns: columnsList } = await this.performIO(query);
+    const columns = columnsList?.[0];
     return {
-      columnNames: columns?.[0]?.map((col) => col.name) ?? [],
-      columnTypes: columns?.[0]?.map(mapColumnType) ?? [],
-      rows: recordset?.map(mapRow) ?? []
+      columnNames: columns?.map((col) => col.name) ?? [],
+      columnTypes: columns?.map(mapColumnType) ?? [],
+      rows: recordset?.map((row) => mapRow(row, columns)) ?? []
     };
   }
   async executeRaw(query) {
@@ -318,13 +328,20 @@ var MssqlTransaction = class extends MssqlQueryable {
   }
   async rollback() {
     debug(`[js::rollback]`);
-    await this.transaction.rollback();
+    await this.transaction.rollback().catch((e) => {
+      if (e.code === "EABORT") {
+        debug(`[js::rollback] Transaction already aborted`);
+        return;
+      }
+      throw e;
+    });
   }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
-  constructor(pool) {
+  constructor(pool, options) {
     super(pool);
     this.pool = pool;
+    this.options = options;
   }
   executeScript(_script) {
     throw new Error("Method not implemented.");
@@ -345,6 +362,7 @@ var PrismaMssqlAdapter = class extends MssqlQueryable {
   }
   getConnectionInfo() {
     return {
+      schemaName: this.options?.schema,
       supportsRelationJoins: false
     };
   }
@@ -353,14 +371,15 @@ var PrismaMssqlAdapter = class extends MssqlQueryable {
   }
 };
 var PrismaMssqlAdapterFactory = class {
-  constructor(config) {
+  constructor(config, options) {
     this.config = config;
+    this.options = options;
   }
   provider = "sqlserver";
   adapterName = name;
   async connect() {
-    const pool = await sql2.connect(this.config);
-    return new PrismaMssqlAdapter(pool);
+    const pool = await import_mssql2.default.connect(this.config);
+    return new PrismaMssqlAdapter(pool, this.options);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -4,14 +4,14 @@ import {
   DriverAdapterError as DriverAdapterError2
 } from "@prisma/driver-adapter-utils";
 import { Mutex } from "async-mutex";
-import * as sql2 from "mssql";
+import sql2 from "mssql";
 
 // package.json
 var name = "@prisma/adapter-mssql";
 
 // src/conversion.ts
 import { ColumnTypeEnum, DriverAdapterError } from "@prisma/driver-adapter-utils";
-import * as sql from "mssql";
+import sql from "mssql";
 function mapColumnType(col) {
   switch (col.type) {
     case sql.VarChar:
@@ -57,7 +57,7 @@ function mapColumnType(col) {
     default:
       throw new DriverAdapterError({
         kind: "UnsupportedNativeDataType",
-        type: `${col.type["constructor"].name}`
+        type: col["udt"]?.name ?? "N/A"
       });
   }
 }
@@ -92,14 +92,23 @@ function mapArg(arg) {
   }
   return arg;
 }
-function mapRow(row) {
-  return row.map((value) => {
+function mapRow(row, columns) {
+  return row.map((value, i) => {
     if (value instanceof Date) {
+      if (columns?.[i]?.type === sql.Time) {
+        return value.toISOString().split("T").at(1)?.replace("Z", "");
+      }
       return value.toISOString();
     }
     if (Buffer.isBuffer(value)) {
       return Array.from(value);
     }
+    if (typeof value === "string" && columns?.[i].type === sql.UniqueIdentifier) {
+      return value.toLowerCase();
+    }
+    if (typeof value === "boolean" && columns?.[i]?.type === sql.Bit) {
+      return value ? 1 : 0;
+    }
     return value;
   });
 }
@@ -231,11 +240,12 @@ var MssqlQueryable = class {
   async queryRaw(query) {
     const tag = "[js::query_raw]";
     debug(`${tag} %O`, query);
-    const { recordset, columns } = await this.performIO(query);
+    const { recordset, columns: columnsList } = await this.performIO(query);
+    const columns = columnsList?.[0];
     return {
-      columnNames: columns?.[0]?.map((col) => col.name) ?? [],
-      columnTypes: columns?.[0]?.map(mapColumnType) ?? [],
-      rows: recordset?.map(mapRow) ?? []
+      columnNames: columns?.map((col) => col.name) ?? [],
+      columnTypes: columns?.map(mapColumnType) ?? [],
+      rows: recordset?.map((row) => mapRow(row, columns)) ?? []
     };
   }
   async executeRaw(query) {
@@ -285,13 +295,20 @@ var MssqlTransaction = class extends MssqlQueryable {
   }
   async rollback() {
     debug(`[js::rollback]`);
-    await this.transaction.rollback();
+    await this.transaction.rollback().catch((e) => {
+      if (e.code === "EABORT") {
+        debug(`[js::rollback] Transaction already aborted`);
+        return;
+      }
+      throw e;
+    });
   }
 };
 var PrismaMssqlAdapter = class extends MssqlQueryable {
-  constructor(pool) {
+  constructor(pool, options) {
     super(pool);
     this.pool = pool;
+    this.options = options;
   }
   executeScript(_script) {
     throw new Error("Method not implemented.");
@@ -312,6 +329,7 @@ var PrismaMssqlAdapter = class extends MssqlQueryable {
   }
   getConnectionInfo() {
     return {
+      schemaName: this.options?.schema,
       supportsRelationJoins: false
     };
   }
@@ -320,14 +338,15 @@ var PrismaMssqlAdapter = class extends MssqlQueryable {
   }
 };
 var PrismaMssqlAdapterFactory = class {
-  constructor(config) {
+  constructor(config, options) {
     this.config = config;
+    this.options = options;
   }
   provider = "sqlserver";
   adapterName = name;
   async connect() {
     const pool = await sql2.connect(this.config);
-    return new PrismaMssqlAdapter(pool);
+    return new PrismaMssqlAdapter(pool, this.options);
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-mssql",
-  "version": "6.10.0-dev.24",
+  "version": "6.10.0-dev.27",
   "description": "Prisma's driver adapter for \"mssql\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,7 +33,7 @@
   "dependencies": {
     "mssql": "^11.0.1",
     "async-mutex": "0.5.0",
-    "@prisma/driver-adapter-utils": "6.10.0-dev.24"
+    "@prisma/driver-adapter-utils": "6.10.0-dev.27"
   },
   "devDependencies": {
     "@types/mssql": "9.1.7",