@mikro-orm/mssql 6.3.8-dev.2 → 6.3.8-dev.4

package/MsSqlSchemaHelper.d.ts

@@ -12,13 +12,13 @@ export declare class MsSqlSchemaHelper extends SchemaHelper {
     getListTablesSQL(): string;
     getNamespaces(connection: AbstractSqlConnection): Promise<string[]>;
     normalizeDefaultValue(defaultValue: string, length: number, defaultValues?: Dictionary<string[]>, stripQuotes?: boolean): string | number;
-    getAllColumns(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Column[]>>;
-    getAllIndexes(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<IndexDef[]>>;
+    getAllColumns(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<Column[]>>;
+    getAllIndexes(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<IndexDef[]>>;
     mapForeignKeys(fks: any[], tableName: string, schemaName?: string): Dictionary;
-    getAllForeignKeys(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Dictionary<ForeignKey>>>;
+    getAllForeignKeys(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<Dictionary<ForeignKey>>>;
     getEnumDefinitions(connection: AbstractSqlConnection, checks: CheckDef[], tableName?: string, schemaName?: string): Promise<Dictionary<string[]>>;
     private getChecksSQL;
-    getAllChecks(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<CheckDef[]>>;
+    getAllChecks(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<CheckDef[]>>;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[]): Promise<void>;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string;
     getPostAlterTable(tableDiff: TableDifference, safe: boolean): string;

package/MsSqlSchemaHelper.js

@@ -47,7 +47,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return super.normalizeDefaultValue(defaultValue, length, MsSqlSchemaHelper.DEFAULT_VALUES);
     }
-    async getAllColumns(connection, tables) {
+    async getAllColumns(connection, tablesBySchemas) {
         const sql = `select table_name as table_name,
       table_schema as schema_name,
       column_name as column_name,
@@ -66,7 +66,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
       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)
       left join sys.extended_properties t4 on t4.major_id = object_id(ic.table_schema + '.' + ic.table_name) and t4.name = 'MS_Description' and t4.minor_id = sc.column_id
-      where table_name in (${tables.map(t => this.platform.quoteValue(t.table_name))})
+      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(ic.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and ic.table_schema = '${schema}')`).join(' OR ')})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
         const str = (val) => val != null ? '' + val : val;
@@ -112,7 +112,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return ret;
     }
-    async getAllIndexes(connection, tables) {
+    async getAllIndexes(connection, tablesBySchemas) {
         const sql = `select t.name as table_name,
       ind.name as index_name,
       is_unique as is_unique,
@@ -125,7 +125,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
       inner join sys.columns col on ic.object_id = col.object_id and ic.column_id = col.column_id
       inner join sys.tables t on ind.object_id = t.object_id
       where
-      t.name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(', ')})
+      (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(t.name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and schema_name(t.schema_id) = '${schema}')`).join(' OR ')})
       order by t.name, ind.name, ind.index_id`;
         const allIndexes = await connection.execute(sql);
         const ret = {};
@@ -158,7 +158,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         }
         return ret;
     }
-    async getAllForeignKeys(connection, tables) {
+    async getAllForeignKeys(connection, tablesBySchemas) {
         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,
@@ -168,7 +168,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
       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 (${tables.map(t => `(ccu.table_name = ${this.platform.quoteValue(t.table_name)} and ccu.table_schema = '${t.schema_name}')`).join(' or ')})
+      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`;
         const allFks = await connection.execute(sql);
         const ret = {};
@@ -204,7 +204,7 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         found.reverse().forEach(index => checks.splice(index, 1));
         return enums;
     }
-    getChecksSQL(tables) {
+    getChecksSQL(tablesBySchemas) {
         return `select con.name as name,
       schema_name(t.schema_id) schema_name,
       t.name table_name,
@@ -213,11 +213,11 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
       from sys.check_constraints con
       left outer join sys.objects t on con.parent_object_id = t.object_id
       left outer join sys.all_columns col on con.parent_column_id = col.column_id and con.parent_object_id = col.object_id
-      where (${tables.map(t => `t.name = ${this.platform.quoteValue(t.table_name)} and schema_name(t.schema_id) = '${t.schema_name}'`).join(' or ')})
+      where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `t.name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and schema_name(t.schema_id) = '${schema}'`).join(' or ')})
       order by con.name`;
     }
-    async getAllChecks(connection, tables) {
-        const sql = this.getChecksSQL(tables);
+    async getAllChecks(connection, tablesBySchemas) {
+        const sql = this.getChecksSQL(tablesBySchemas);
         const allChecks = await connection.execute(sql);
         const ret = {};
         for (const check of allChecks) {
@@ -236,10 +236,11 @@ class MsSqlSchemaHelper extends knex_1.SchemaHelper {
         if (tables.length === 0) {
             return;
         }
-        const columns = await this.getAllColumns(connection, tables);
-        const indexes = await this.getAllIndexes(connection, tables);
-        const checks = await this.getAllChecks(connection, tables);
-        const fks = await this.getAllForeignKeys(connection, tables);
+        const tablesBySchema = this.getTablesGroupedBySchemas(tables);
+        const columns = await this.getAllColumns(connection, tablesBySchema);
+        const indexes = await this.getAllIndexes(connection, tablesBySchema);
+        const checks = await this.getAllChecks(connection, tablesBySchema);
+        const fks = await this.getAllForeignKeys(connection, tablesBySchema);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "6.3.8-dev.2",
+  "version": "6.3.8-dev.4",
   "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.8-dev.2",
+    "@mikro-orm/knex": "6.3.8-dev.4",
     "tedious": "19.0.0",
     "tsqlstring": "1.0.1"
   },
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.3.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.8-dev.2"
+    "@mikro-orm/core": "6.3.8-dev.4"
   }
 }