@mikro-orm/mssql 7.0.0-dev.114 → 7.0.0-dev.115

package/MsSqlDriver.d.ts

@@ -1,12 +1,12 @@
-import { type AnyEntity, type Configuration, type ConnectionType, type EntityDictionary, type LoggingOptions, type NativeInsertUpdateManyOptions, type QueryResult, type Transaction, type Constructor } from '@mikro-orm/core';
+import { type AnyEntity, type Configuration, type ConnectionType, type EntityDictionary, type LoggingOptions, type NativeInsertUpdateManyOptions, type QueryResult, type Transaction, type Constructor, type EntityName } from '@mikro-orm/core';
 import { AbstractSqlDriver, type SqlEntityManager } from '@mikro-orm/sql';
 import { MsSqlConnection } from './MsSqlConnection.js';
 import { MsSqlQueryBuilder } from './MsSqlQueryBuilder.js';
 import { MsSqlMikroORM } from './MsSqlMikroORM.js';
 export declare class MsSqlDriver extends AbstractSqlDriver<MsSqlConnection> {
     constructor(config: Configuration);
-    nativeInsertMany<T extends AnyEntity<T>>(entityName: string, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
-    createQueryBuilder<T extends AnyEntity<T>>(entityName: string, ctx?: Transaction, preferredConnectionType?: ConnectionType, convertCustomTypes?: boolean, loggerContext?: LoggingOptions, alias?: string, em?: SqlEntityManager): MsSqlQueryBuilder<T, any, any, any>;
+    nativeInsertMany<T extends AnyEntity<T>>(entityName: EntityName<T>, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
+    createQueryBuilder<T extends AnyEntity<T>>(entityName: EntityName<T>, ctx?: Transaction, preferredConnectionType?: ConnectionType, convertCustomTypes?: boolean, loggerContext?: LoggingOptions, alias?: string, em?: SqlEntityManager): MsSqlQueryBuilder<T, any, any, any>;
     private appendOutputTable;
     /** @inheritDoc */
     getORMClass(): Constructor<MsSqlMikroORM>;

package/MsSqlDriver.js

@@ -25,7 +25,7 @@ export class MsSqlDriver extends AbstractSqlDriver {
             const output = returningFields.length > 0 ? `output ${returningFields.map(field => 'inserted.' + this.platform.quoteIdentifier(field)).join(', ')}` : '';
             const sql = `merge into ${tableName} using (${using2}) s on 1 = 0 when not matched then insert default values ${output};`;
             const res = await this.execute(sql, [], 'run', options.ctx);
-            const pks = this.getPrimaryKeyFields(entityName);
+            const pks = this.getPrimaryKeyFields(meta);
             if (pks.length === 1) {
                 res.row ??= {};
                 res.rows ??= [];

package/MsSqlQueryBuilder.js

@@ -4,7 +4,7 @@ export class MsSqlQueryBuilder extends QueryBuilder {
     insert(data) {
         this.checkIdentityInsert(data);
         if (!this.flags.has(QueryFlag.IDENTITY_INSERT) && this.metadata.has(this.mainAlias.entityName)) {
-            const meta = this.metadata.find(this.mainAlias.entityName);
+            const meta = this.mainAlias.meta;
             if (meta.hasTriggers) {
                 this.setFlag(QueryFlag.OUTPUT_TABLE);
             }
@@ -12,11 +12,8 @@ export class MsSqlQueryBuilder extends QueryBuilder {
         return super.insert(data);
     }
     checkIdentityInsert(data) {
-        const meta = this.metadata.find(this.mainAlias.entityName);
-        if (!meta) {
-            return;
-        }
-        const dataKeys = Utils.unique(Utils.asArray(data).flatMap(Object.keys));
+        const meta = this.mainAlias.meta;
+        const dataKeys = Utils.unique(Utils.asArray(data).flatMap(Utils.keys));
         const hasAutoincrement = dataKeys.some(x => meta.properties[x]?.autoincrement);
         if (hasAutoincrement) {
             this.setFlag(QueryFlag.IDENTITY_INSERT);

package/MsSqlSchemaGenerator.js

@@ -11,7 +11,7 @@ export class MsSqlSchemaGenerator extends SchemaGenerator {
         }
         // https://stackoverflow.com/questions/253849/cannot-truncate-table-because-it-is-being-referenced-by-a-foreign-key-constraint
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
-            const res = await this.driver.nativeDelete(meta.className, {}, options);
+            const res = await this.driver.nativeDelete(meta.class, {}, options);
             if (meta.getPrimaryProps().some(pk => pk.autoincrement)) {
                 const tableName = this.driver.getTableName(meta, { schema: options?.schema }, false);
                 await this.execute(`dbcc checkident ('${tableName}', reseed, ${res.affectedRows > 0 ? 0 : 1})`, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/mssql",
   "type": "module",
-  "version": "7.0.0-dev.114",
+  "version": "7.0.0-dev.115",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.0.0-dev.114",
+    "@mikro-orm/sql": "7.0.0-dev.115",
     "kysely": "0.28.9",
     "tarn": "3.0.2",
     "tedious": "19.1.3",
@@ -60,6 +60,6 @@
     "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.114"
+    "@mikro-orm/core": "7.0.0-dev.115"
   }
 }