@mikro-orm/mssql 6.3.5-dev.16 → 6.3.5-dev.18

package/MsSqlPlatform.d.ts

@@ -18,7 +18,7 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
     getDateTimeTypeDeclarationSQL(column: {
         length?: number;
     }): string;
-    getTimeTypeDeclarationSQL(): string;
+    getDefaultDateTimeLength(): number;
     getFloatDeclarationSQL(): string;
     getDoubleDeclarationSQL(): string;
     getBooleanTypeDeclarationSQL(): string;
@@ -35,6 +35,11 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
         unsigned?: boolean;
         autoincrement?: boolean;
     }): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+    }): string;
     getDefaultMappedType(type: string): Type<unknown>;
     getDefaultSchemaName(): string | undefined;
     getUuidTypeDeclarationSQL(column: {

package/MsSqlPlatform.js

@@ -51,8 +51,8 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
         /* istanbul ignore next */
         return 'datetime2' + (column.length != null ? `(${column.length})` : '');
     }
-    getTimeTypeDeclarationSQL() {
-        return 'time';
+    getDefaultDateTimeLength() {
+        return 7;
     }
     getFloatDeclarationSQL() {
         return 'float(24)';
@@ -85,7 +85,21 @@ class MsSqlPlatform extends knex_1.AbstractSqlPlatform {
         /* istanbul ignore next */
         return this.getSmallIntTypeDeclarationSQL(column);
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['decimal', 'numeric'].includes(simpleType)) {
+            return this.getDecimalTypeDeclarationSQL(options);
+        }
+        if (['real'].includes(simpleType)) {
+            return this.getFloatDeclarationSQL();
+        }
+        return super.normalizeColumnType(type, options);
+    }
     getDefaultMappedType(type) {
+        if (type.startsWith('float')) {
+            const len = type.match(/float\((\d+)\)/)?.[1] ?? 24;
+            return +len > 24 ? knex_1.Type.getType(knex_1.DoubleType) : knex_1.Type.getType(knex_1.FloatType);
+        }
         const normalizedType = this.extractSimpleType(type);
         if (normalizedType !== 'uuid' && ['string', 'nvarchar'].includes(normalizedType)) {
             return knex_1.Type.getType(UnicodeStringType_1.UnicodeStringType);

package/MsSqlSchemaHelper.js

@@ -59,7 +59,8 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
       cmp.is_persisted as is_persisted,
       numeric_precision as numeric_precision,
       numeric_scale as numeric_scale,
-      coalesce(datetime_precision, character_maximum_length) length,
+      datetime_precision as datetime_precision,
+      character_maximum_length as character_maximum_length,
       columnproperty(sc.object_id, column_name, 'IsIdentity') is_identity
       from information_schema.columns ic
       inner join sys.columns sc on sc.name = ic.column_name and sc.object_id = object_id(ic.table_schema + '.' + ic.table_name)
@@ -78,12 +79,21 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
             /* istanbul ignore next */
             const generated = col.generation_expression ? `${col.generation_expression}${col.is_persisted ? ' persisted' : ''}` : undefined;
             let type = col.data_type;
-            if (col.length != null && !type.endsWith(`(${col.length})`)) {
-                type += `(${col.length})`;
+            if (['varchar', 'nvarchar', 'char', 'nchar', 'varbinary'].includes(col.data_type)) {
+                col.length = col.character_maximum_length;
+            }
+            if (['timestamp', 'datetime', 'datetime2', 'time', 'datetimeoffset'].includes(col.data_type)) {
+                col.length = col.datetime_precision;
+            }
+            if (col.length != null && !type.endsWith(`(${col.length})`) && !['text', 'date'].includes(type)) {
+                type += `(${col.length === -1 ? 'max' : col.length})`;
             }
             if (type === 'numeric' && col.numeric_precision != null && col.numeric_scale != null) {
                 type += `(${col.numeric_precision},${col.numeric_scale})`;
             }
+            if (type === 'float' && col.numeric_precision != null) {
+                type += `(${col.numeric_precision})`;
+            }
             ret[key] ??= [];
             ret[key].push({
                 name: col.column_name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "6.3.5-dev.16",
+  "version": "6.3.5-dev.18",
   "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.3.5-dev.16",
+    "@mikro-orm/knex": "6.3.5-dev.18",
     "tedious": "18.3.0",
     "tsqlstring": "1.0.1"
   },
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.16"
+    "@mikro-orm/core": "6.3.5-dev.18"
   }
 }