@mikro-orm/mssql 6.2.10-dev.75 → 6.2.10-dev.76

package/MsSqlPlatform.d.ts

@@ -23,6 +23,9 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
     getRegExpOperator(): string;
     getBlobDeclarationSQL(): string;
     getJsonDeclarationSQL(): string;
+    getVarcharTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
     getEnumTypeDeclarationSQL(column: {
         items?: unknown[];
         fieldNames: string[];

package/MsSqlPlatform.js

@@ -10,6 +10,7 @@ const tsqlstring_1 = __importDefault(require("tsqlstring"));
 const MsSqlSchemaHelper_1 = require("./MsSqlSchemaHelper");
 const MsSqlExceptionConverter_1 = require("./MsSqlExceptionConverter");
 const MsSqlSchemaGenerator_1 = require("./MsSqlSchemaGenerator");
+const UnicodeCharacterType_1 = require("./UnicodeCharacterType");
 const UnicodeStringType_1 = require("./UnicodeStringType");
 class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
     schemaHelper = new MsSqlSchemaHelper_1.MsSqlSchemaHelper(this);
@@ -65,9 +66,15 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
     getJsonDeclarationSQL() {
         return 'nvarchar(max)';
     }
+    getVarcharTypeDeclarationSQL(column) {
+        if (column.length === -1) {
+            return 'varchar(max)';
+        }
+        return super.getVarcharTypeDeclarationSQL(column);
+    }
     getEnumTypeDeclarationSQL(column) {
         if (column.items?.every(item => knex_1.Utils.isString(item))) {
-            return knex_1.Type.getType(UnicodeStringType_1.UnicodeStringType).getColumnType({ length: 100, ...column });
+            return knex_1.Type.getType(UnicodeStringType_1.UnicodeStringType).getColumnType({ length: 100, ...column }, this);
         }
         /* istanbul ignore next */
         return this.getSmallIntTypeDeclarationSQL(column);
@@ -77,6 +84,9 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
         if (normalizedType !== 'uuid' && ['string', 'nvarchar'].includes(normalizedType)) {
             return knex_1.Type.getType(UnicodeStringType_1.UnicodeStringType);
         }
+        if (['character', 'nchar'].includes(normalizedType)) {
+            return knex_1.Type.getType(UnicodeCharacterType_1.UnicodeCharacterType);
+        }
         const map = {
             int: 'integer',
             bit: 'boolean',

package/MsSqlSchemaHelper.js

@@ -345,7 +345,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         if (!match) {
             return;
         }
-        if (match[2] === 'max' && ['varchar', 'nvarchar'].includes(match[1])) {
+        if (match[2] === 'max') {
             return -1;
         }
         return +match[2];

package/UnicodeCharacterType.d.ts

@@ -0,0 +1,6 @@
+import type { Platform, EntityProperty } from '@mikro-orm/core';
+import { UnicodeStringType } from './UnicodeStringType';
+export declare class UnicodeCharacterType extends UnicodeStringType {
+    getColumnType(prop: EntityProperty, platform: Platform): string;
+    getDefaultLength(platform: Platform): number;
+}

package/UnicodeCharacterType.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnicodeCharacterType = void 0;
+const UnicodeStringType_1 = require("./UnicodeStringType");
+class UnicodeCharacterType extends UnicodeStringType_1.UnicodeStringType {
+    getColumnType(prop, platform) {
+        const length = prop.length === -1 ? 'max' : (prop.length ?? this.getDefaultLength(platform));
+        return `nchar(${length})`;
+    }
+    getDefaultLength(platform) {
+        return platform.getDefaultCharLength();
+    }
+}
+exports.UnicodeCharacterType = UnicodeCharacterType;

package/UnicodeStringType.d.ts

@@ -1,4 +1,4 @@
-import { Type } from '@mikro-orm/core';
+import { type Platform, Type } from '@mikro-orm/core';
 export declare class UnicodeString {
     readonly value: string;
     constructor(value: string);
@@ -10,9 +10,10 @@ export declare class UnicodeString {
 export declare class UnicodeStringType extends Type<string | null, string | null> {
     getColumnType(prop: {
         length?: number;
-    }): string;
+    }, platform: Platform): string;
     convertToJSValue(value: string | null | UnicodeString): string | null;
     convertToDatabaseValue(value: string | null): string | null;
     get runtimeType(): string;
     toJSON(value: string | null | UnicodeString): string | null;
+    getDefaultLength(platform: Platform): number;
 }

package/UnicodeStringType.js

@@ -22,8 +22,8 @@ class UnicodeString {
 }
 exports.UnicodeString = UnicodeString;
 class UnicodeStringType extends core_1.Type {
-    getColumnType(prop) {
-        const length = prop.length === -1 ? 'max' : (prop.length ?? 255);
+    getColumnType(prop, platform) {
+        const length = prop.length === -1 ? 'max' : (prop.length ?? this.getDefaultLength(platform));
         return `nvarchar(${length})`;
     }
     convertToJSValue(value) {
@@ -45,5 +45,8 @@ class UnicodeStringType extends core_1.Type {
     toJSON(value) {
         return this.convertToJSValue(value);
     }
+    getDefaultLength(platform) {
+        return platform.getDefaultVarcharLength();
+    }
 }
 exports.UnicodeStringType = UnicodeStringType;

package/index.mjs

@@ -33,6 +33,7 @@ export const ChangeSet = mod.ChangeSet;
 export const ChangeSetComputer = mod.ChangeSetComputer;
 export const ChangeSetPersister = mod.ChangeSetPersister;
 export const ChangeSetType = mod.ChangeSetType;
+export const CharacterType = mod.CharacterType;
 export const Check = mod.Check;
 export const CheckConstraintViolationException = mod.CheckConstraintViolationException;
 export const Collection = mod.Collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "6.2.10-dev.75",
+  "version": "6.2.10-dev.76",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.2.10-dev.75",
+    "@mikro-orm/knex": "6.2.10-dev.76",
     "tedious": "18.2.1",
     "tsqlstring": "1.0.1"
   },
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.75"
+    "@mikro-orm/core": "6.2.10-dev.76"
   }
 }