@mikro-orm/mssql 7.2.6-dev.13 → 7.2.6-dev.16

package/MsSqlSchemaHelper.d.ts

@@ -20,7 +20,6 @@ export declare class MsSqlSchemaHelper extends SchemaHelper {
     normalizeDefaultValue(defaultValue: string, length: number, defaultValues?: Dictionary<string[]>, stripQuotes?: boolean): string | number;
     getAllColumns(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<Column[]>>;
     getAllIndexes(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<IndexDef[]>>;
-    mapForeignKeys(fks: any[], tableName: string, schemaName?: string): Dictionary;
     getAllForeignKeys(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<Dictionary<ForeignKey>>>;
     private getEnumDefinitions;
     private getChecksSQL;

package/MsSqlSchemaHelper.js

@@ -254,26 +254,24 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return ret;
     }
-    mapForeignKeys(fks, tableName, schemaName) {
-        const ret = super.mapForeignKeys(fks, tableName, schemaName);
-        for (const fk of Utils.values(ret)) {
-            fk.columnNames = Utils.unique(fk.columnNames);
-            fk.referencedColumnNames = Utils.unique(fk.referencedColumnNames);
-        }
-        return ret;
-    }
     async getAllForeignKeys(connection, tablesBySchemas, ctx) {
-        const sql = `select ccu.constraint_name, ccu.table_name, ccu.table_schema schema_name, ccu.column_name,
-      kcu.constraint_schema referenced_schema_name,
-      kcu.column_name referenced_column_name,
-      kcu.table_name referenced_table_name,
-      rc.update_rule,
-      rc.delete_rule
-      from information_schema.constraint_column_usage ccu
-      inner join information_schema.referential_constraints rc on ccu.constraint_name = rc.constraint_name and rc.constraint_schema = ccu.constraint_schema
-      inner join information_schema.key_column_usage kcu on kcu.constraint_name = rc.unique_constraint_name and rc.unique_constraint_schema = kcu.constraint_schema
-      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(ccu.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and ccu.table_schema = '${schema}')`).join(' or ')})
-      order by kcu.table_schema, kcu.table_name, kcu.ordinal_position, kcu.constraint_name`;
+        // `sys.foreign_key_columns` pairs local and referenced columns of composite FKs, `information_schema` can't
+        const sql = `select fk.name constraint_name, t.name table_name, s.name schema_name, c.name column_name,
+      rs.name referenced_schema_name,
+      rc.name referenced_column_name,
+      rt.name referenced_table_name,
+      replace(fk.update_referential_action_desc, '_', ' ') update_rule,
+      replace(fk.delete_referential_action_desc, '_', ' ') delete_rule
+      from sys.foreign_keys fk
+      inner join sys.foreign_key_columns fkc on fkc.constraint_object_id = fk.object_id
+      inner join sys.tables t on t.object_id = fk.parent_object_id
+      inner join sys.schemas s on s.schema_id = t.schema_id
+      inner join sys.columns c on c.object_id = fkc.parent_object_id and c.column_id = fkc.parent_column_id
+      inner join sys.tables rt on rt.object_id = fk.referenced_object_id
+      inner join sys.schemas rs on rs.schema_id = rt.schema_id
+      inner join sys.columns rc on rc.object_id = fkc.referenced_object_id and rc.column_id = fkc.referenced_column_id
+      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(t.name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and s.name = '${schema}')`).join(' or ')})
+      order by rs.name, rt.name, fkc.constraint_column_id, fk.name`;
         const allFks = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const fk of allFks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "7.2.6-dev.13",
+  "version": "7.2.6-dev.16",
   "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,7 +47,7 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.6-dev.13",
+    "@mikro-orm/sql": "7.2.6-dev.16",
     "kysely": "0.29.6",
     "tarn": "3.1.2",
     "tedious": "20.3.7",
@@ -57,7 +57,7 @@
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.13"
+    "@mikro-orm/core": "7.2.6-dev.16"
   },
   "engines": {
     "node": ">= 22.17.0"