@mikro-orm/mssql 7.1.0-dev.21 → 7.1.0-dev.23

package/MsSqlSchemaHelper.d.ts

@@ -30,6 +30,7 @@ export declare class MsSqlSchemaHelper extends SchemaHelper {
     /** Generates SQL to drop an MSSQL trigger. */
     dropTrigger(table: DatabaseTable, trigger: SqlTriggerDef): string;
     private getSchemaQualifiedName;
+    getDatabaseCollation(connection: AbstractSqlConnection, ctx?: Transaction): Promise<string | undefined>;
     getAllTriggers(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<SqlTriggerDef[]>>;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[], ctx?: Transaction): Promise<void>;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string[];

package/MsSqlSchemaHelper.js

@@ -114,7 +114,8 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       numeric_scale as numeric_scale,
       datetime_precision as datetime_precision,
       character_maximum_length as character_maximum_length,
-      columnproperty(sc.object_id, column_name, 'IsIdentity') is_identity
+      columnproperty(sc.object_id, column_name, 'IsIdentity') is_identity,
+      nullif(ic.collation_name, convert(nvarchar(128), databasepropertyex(db_name(), 'Collation'))) as collation_name
       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)
       left join sys.computed_columns cmp on cmp.name = ic.column_name and cmp.object_id = object_id(ic.table_schema + '.' + ic.table_name)
@@ -166,6 +167,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
                 precision: col.numeric_precision,
                 scale: col.numeric_scale,
                 comment: col.column_comment,
+                collation: col.collation_name ?? undefined,
                 generated,
             });
         }
@@ -358,6 +360,10 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return this.quote(name);
     }
+    async getDatabaseCollation(connection, ctx) {
+        const [row] = await connection.execute(`select convert(nvarchar(128), databasepropertyex(db_name(), 'Collation')) as collation`, [], 'all', ctx);
+        return row?.collation;
+    }
     async getAllTriggers(connection, tablesBySchemas) {
         const conditions = [];
         for (const [schema, tables] of tablesBySchemas) {
@@ -419,9 +425,11 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         const checks = await this.getAllChecks(connection, tablesBySchema, ctx);
         const fks = await this.getAllForeignKeys(connection, tablesBySchema, ctx);
         const triggers = await this.getAllTriggers(connection, tablesBySchema);
+        const dbCollation = await this.getDatabaseCollation(connection, ctx);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
+            table.collation = dbCollation;
             const pks = await this.getPrimaryKeys(connection, indexes[key], table.name, table.schema);
             const enums = this.getEnumDefinitions(checks[key] ?? []);
             table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums);
@@ -543,7 +551,11 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         else {
             col.push(columnType);
         }
-        Utils.runIfNotEmpty(() => col.push('identity(1,1)'), column.autoincrement);
+        Utils.runIfNotEmpty(() => col.push(this.getCollateSQL(column.collation)), column.collation);
+        // `IDENTITY(1,1)` is rejected inside `ALTER COLUMN`, so it must only be emitted when the
+        // change actually involves the identity attribute or is a fresh column (no `changedProperties`).
+        Utils.runIfNotEmpty(() => col.push('identity(1,1)'), column.autoincrement &&
+            (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type')));
         Utils.runIfNotEmpty(() => col.push('null'), column.nullable);
         Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable && !column.generated);
         if (column.autoincrement &&
@@ -565,7 +577,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             const [constraint] = this.getDropDefaultsSQL(table.name, [column], table.schema);
             parts.push(constraint);
         }
-        if (changedProperties.has('type') || changedProperties.has('nullable')) {
+        if (changedProperties.has('type') || changedProperties.has('nullable') || changedProperties.has('collation')) {
             const col = this.createTableColumn(column, table, changedProperties);
             parts.push(`alter table ${table.getQuotedName()} alter column ${col}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "7.1.0-dev.21",
+  "version": "7.1.0-dev.23",
   "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.",
   "keywords": [
     "data-mapper",
@@ -47,17 +47,17 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.1.0-dev.21",
+    "@mikro-orm/sql": "7.1.0-dev.23",
     "kysely": "0.28.16",
     "tarn": "3.0.2",
     "tedious": "19.2.1",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.12"
+    "@mikro-orm/core": "^7.0.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.21"
+    "@mikro-orm/core": "7.1.0-dev.23"
   },
   "engines": {
     "node": ">= 22.17.0"