@mikro-orm/mssql 6.2.10-dev.11 → 6.2.10-dev.111

package/MsSqlConnection.js

@@ -16,6 +16,7 @@ class MsSqlConnection extends knex_1.AbstractSqlConnection {
             options: {
                 enableArithAbort: true,
                 fallbackToDefaultDb: true,
+                useUTC: this.config.get('forceUtcTimezone'),
             },
         };
         /* istanbul ignore next */

package/MsSqlMikroORM.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineMsSqlConfig = exports.MsSqlMikroORM = void 0;
+exports.MsSqlMikroORM = void 0;
+exports.defineMsSqlConfig = defineMsSqlConfig;
 const core_1 = require("@mikro-orm/core");
 const MsSqlDriver_1 = require("./MsSqlDriver");
 /**
@@ -26,4 +27,3 @@ exports.MsSqlMikroORM = MsSqlMikroORM;
 function defineMsSqlConfig(options) {
     return (0, core_1.defineConfig)({ driver: MsSqlDriver_1.MsSqlDriver, ...options });
 }
-exports.defineMsSqlConfig = defineMsSqlConfig;

package/MsSqlPlatform.d.ts

@@ -7,6 +7,8 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
     protected readonly exceptionConverter: MsSqlExceptionConverter;
     /** @inheritDoc */
     lookupExtensions(orm: MikroORM): void;
+    /** @inheritDoc */
+    init(orm: MikroORM): void;
     usesOutputStatement(): boolean;
     convertDateToJSValue(value: string | Date): string;
     convertsJsonAutomatically(): boolean;
@@ -23,16 +25,18 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
     getRegExpOperator(): string;
     getBlobDeclarationSQL(): string;
     getJsonDeclarationSQL(): string;
+    getVarcharTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
     getEnumTypeDeclarationSQL(column: {
-        fieldNames: string[];
         items?: unknown[];
+        fieldNames: string[];
         length?: number;
+        unsigned?: boolean;
+        autoincrement?: boolean;
     }): string;
     getDefaultMappedType(type: string): Type<unknown>;
     getDefaultSchemaName(): string | undefined;
-    getVarcharTypeDeclarationSQL(column: {
-        length?: number;
-    }): string;
     getUuidTypeDeclarationSQL(column: {
         length?: number;
     }): 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);
@@ -18,6 +19,12 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
     lookupExtensions(orm) {
         MsSqlSchemaGenerator_1.MsSqlSchemaGenerator.register(orm);
     }
+    /** @inheritDoc */
+    init(orm) {
+        super.init(orm);
+        // do not double escape backslash inside strings
+        tsqlstring_1.default.CHARS_GLOBAL_REGEXP = /[\0\b\f\t\n\r\v\x1a']/g; // eslint-disable-line no-control-regex
+    }
     usesOutputStatement() {
         return true;
     }
@@ -26,7 +33,7 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
         if (typeof value === 'string') {
             return value;
         }
-        return value.toISOString().substring(0, 10);
+        return tsqlstring_1.default.dateToString(value.toISOString(), this.timezone ?? 'local').substring(1, 11);
     }
     convertsJsonAutomatically() {
         return false;
@@ -65,9 +72,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 this.getVarcharTypeDeclarationSQL({ 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 +90,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',
@@ -90,9 +106,6 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
     getDefaultSchemaName() {
         return 'dbo';
     }
-    getVarcharTypeDeclarationSQL(column) {
-        return `nvarchar(${column.length ?? 255})`;
-    }
     getUuidTypeDeclarationSQL(column) {
         return 'uniqueidentifier';
     }
@@ -153,13 +166,13 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
         }
         /* istanbul ignore if */
         if (knex_1.Utils.isPlainObject(value) || value?.[knex_1.JsonProperty]) {
-            return tsqlstring_1.default.escape(JSON.stringify(value), true, this.timezone);
+            return tsqlstring_1.default.escape(JSON.stringify(value), true, this.timezone ?? 'local');
         }
         if (value instanceof Buffer) {
             return `0x${value.toString('hex')}`;
         }
         if (value instanceof Date) {
-            return tsqlstring_1.default.dateToString(value.toISOString(), 'Z');
+            return tsqlstring_1.default.dateToString(value.toISOString(), this.timezone ?? 'local');
         }
         return tsqlstring_1.default.escape(value);
     }

package/MsSqlSchemaHelper.js

@@ -341,14 +341,14 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         return super.createTableColumn(table, column, fromTable, changedProperties);
     }
     inferLengthFromColumnType(type) {
-        const match = type.match(/n?varchar\((-?\d+|max)\)/);
+        const match = type.match(/^(\w+)\s*\(\s*(-?\d+|max)\s*\)/);
         if (!match) {
-            return undefined;
+            return;
         }
-        if (match[1] === 'max') {
+        if (match[2] === 'max') {
             return -1;
         }
-        return +match[1];
+        return +match[2];
     }
     wrap(val, type) {
         const stringType = type instanceof knex_1.StringType || type instanceof knex_1.TextType || type instanceof knex_1.EnumType || type instanceof UnicodeStringType_1.UnicodeStringType;

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, type EntityProperty } from '@mikro-orm/core';
+import { type Platform, Type } from '@mikro-orm/core';
 export declare class UnicodeString {
     readonly value: string;
     constructor(value: string);
@@ -8,9 +8,12 @@ export declare class UnicodeString {
     [Symbol.toPrimitive](): string;
 }
 export declare class UnicodeStringType extends Type<string | null, string | null> {
-    getColumnType(prop: EntityProperty): string;
+    getColumnType(prop: {
+        length?: number;
+    }, 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.11",
+  "version": "6.2.10-dev.111",
   "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,14 +58,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.2.10-dev.11",
-    "tedious": "18.2.0",
+    "@mikro-orm/knex": "6.2.10-dev.111",
+    "tedious": "18.2.4",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.11"
+    "@mikro-orm/core": "6.2.10-dev.111"
   }
 }