@mikro-orm/mssql 7.0.7-dev.9 → 7.0.8-dev.0

package/MsSqlSchemaHelper.d.ts

@@ -1,4 +1,4 @@
-import { type AbstractSqlConnection, type CheckDef, type Column, type DatabaseSchema, type DatabaseTable, type Dictionary, type ForeignKey, type IndexDef, SchemaHelper, type Table, type TableDifference, type Type } from '@mikro-orm/sql';
+import { type AbstractSqlConnection, type CheckDef, type Column, type DatabaseSchema, type DatabaseTable, type Dictionary, type ForeignKey, type IndexDef, SchemaHelper, type Table, type TableDifference, type Transaction, type Type } from '@mikro-orm/sql';
 /** Schema introspection helper for Microsoft SQL Server. */
 export declare class MsSqlSchemaHelper extends SchemaHelper {
     static readonly DEFAULT_VALUES: {
@@ -13,17 +13,17 @@ export declare class MsSqlSchemaHelper extends SchemaHelper {
     getDatabaseExistsSQL(name: string): string;
     getListTablesSQL(): string;
     getListViewsSQL(): string;
-    loadViews(schema: DatabaseSchema, connection: AbstractSqlConnection): Promise<void>;
-    getNamespaces(connection: AbstractSqlConnection): Promise<string[]>;
+    loadViews(schema: DatabaseSchema, connection: AbstractSqlConnection, schemaName?: string, ctx?: Transaction): Promise<void>;
+    getNamespaces(connection: AbstractSqlConnection, ctx?: Transaction): Promise<string[]>;
     normalizeDefaultValue(defaultValue: string, length: number, defaultValues?: Dictionary<string[]>, stripQuotes?: boolean): string | number;
-    getAllColumns(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<Column[]>>;
-    getAllIndexes(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<IndexDef[]>>;
+    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[]>): Promise<Dictionary<Dictionary<ForeignKey>>>;
+    getAllForeignKeys(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<Dictionary<ForeignKey>>>;
     private getEnumDefinitions;
     private getChecksSQL;
-    getAllChecks(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>): Promise<Dictionary<CheckDef[]>>;
-    loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[]): Promise<void>;
+    getAllChecks(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<CheckDef[]>>;
+    loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[], ctx?: Transaction): Promise<void>;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string[];
     getPostAlterTable(tableDiff: TableDifference, safe: boolean): string[];
     getCreateNamespaceSQL(name: string): string;

package/MsSqlSchemaHelper.js

@@ -36,8 +36,8 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       inner join sys.sql_modules m on v.object_id = m.object_id
       order by schema_name(v.schema_id), v.name`;
     }
-    async loadViews(schema, connection) {
-        const views = await connection.execute(this.getListViewsSQL());
+    async loadViews(schema, connection, schemaName, ctx) {
+        const views = await connection.execute(this.getListViewsSQL(), [], 'all', ctx);
         for (const view of views) {
             // Extract SELECT statement from CREATE VIEW ... AS SELECT ...
             const match = /\bAS\s+(.+)$/is.exec(view.view_definition);
@@ -48,9 +48,9 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             }
         }
     }
-    async getNamespaces(connection) {
+    async getNamespaces(connection, ctx) {
         const sql = `select name as schema_name from sys.schemas order by name`;
-        const res = await connection.execute(sql);
+        const res = await connection.execute(sql, [], 'all', ctx);
         return res.map(row => row.schema_name);
     }
     normalizeDefaultValue(defaultValue, length, defaultValues = {}, stripQuotes = false) {
@@ -68,7 +68,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return super.normalizeDefaultValue(defaultValue, length, MsSqlSchemaHelper.DEFAULT_VALUES);
     }
-    async getAllColumns(connection, tablesBySchemas) {
+    async getAllColumns(connection, tablesBySchemas, ctx) {
         const sql = `select table_name as table_name,
       table_schema as schema_name,
       column_name as column_name,
@@ -91,7 +91,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       left join sys.default_constraints t5 on sc.default_object_id = t5.object_id
       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 allColumns = await connection.execute(sql, [], 'all', ctx);
         const str = (val) => (val != null ? '' + val : val);
         const ret = {};
         for (const col of allColumns) {
@@ -140,7 +140,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return ret;
     }
-    async getAllIndexes(connection, tablesBySchemas) {
+    async getAllIndexes(connection, tablesBySchemas, ctx) {
         const sql = `select t.name as table_name,
       ind.name as index_name,
       is_unique as is_unique,
@@ -160,7 +160,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       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 t.name, ind.name, ic.is_included_column, ic.key_ordinal`;
-        const allIndexes = await connection.execute(sql);
+        const allIndexes = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const index of allIndexes) {
             const key = this.getTableKey(index);
@@ -212,7 +212,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return ret;
     }
-    async getAllForeignKeys(connection, tablesBySchemas) {
+    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,
@@ -224,7 +224,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       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`;
-        const allFks = await connection.execute(sql);
+        const allFks = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const fk of allFks) {
             const key = this.getTableKey(fk);
@@ -268,9 +268,9 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       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, tablesBySchemas) {
+    async getAllChecks(connection, tablesBySchemas, ctx) {
         const sql = this.getChecksSQL(tablesBySchemas);
-        const allChecks = await connection.execute(sql);
+        const allChecks = await connection.execute(sql, [], 'all', ctx);
         const ret = {};
         for (const check of allChecks) {
             const key = this.getTableKey(check);
@@ -285,15 +285,15 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         }
         return ret;
     }
-    async loadInformationSchema(schema, connection, tables) {
+    async loadInformationSchema(schema, connection, tables, schemas, ctx) {
         if (tables.length === 0) {
             return;
         }
         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);
+        const columns = await this.getAllColumns(connection, tablesBySchema, ctx);
+        const indexes = await this.getAllIndexes(connection, tablesBySchema, ctx);
+        const checks = await this.getAllChecks(connection, tablesBySchema, ctx);
+        const fks = await this.getAllForeignKeys(connection, tablesBySchema, ctx);
         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": "7.0.7-dev.9",
+  "version": "7.0.8-dev.0",
   "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.0.7-dev.9",
-    "kysely": "0.28.14",
+    "@mikro-orm/sql": "7.0.8-dev.0",
+    "kysely": "0.28.15",
     "tarn": "3.0.2",
     "tedious": "19.2.1",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.6"
+    "@mikro-orm/core": "^7.0.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.7-dev.9"
+    "@mikro-orm/core": "7.0.8-dev.0"
   },
   "engines": {
     "node": ">= 22.17.0"