@mikro-orm/mssql 7.1.0-dev.26 → 7.1.0-dev.28

package/MsSqlMikroORM.d.ts

@@ -1,5 +1,5 @@
-import { type AnyEntity, type EntityClass, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
-import type { SqlEntityManager } from '@mikro-orm/sql';
+import { type AnyEntity, type EntityClass, type EntitySchema, type MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { SqlMikroORM, type SqlEntityManager } from '@mikro-orm/sql';
 import { MsSqlDriver } from './MsSqlDriver.js';
 /** Configuration options for the MSSQL driver. */
 export type MsSqlOptions<EM extends SqlEntityManager<MsSqlDriver> = SqlEntityManager<MsSqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> = Partial<Options<MsSqlDriver, EM, Entities>>;
@@ -8,7 +8,7 @@ export declare function defineMsSqlConfig<EM extends SqlEntityManager<MsSqlDrive
 /**
  * @inheritDoc
  */
-export declare class MsSqlMikroORM<EM extends SqlEntityManager<MsSqlDriver> = SqlEntityManager<MsSqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends MikroORM<MsSqlDriver, EM, Entities> {
+export declare class MsSqlMikroORM<EM extends SqlEntityManager<MsSqlDriver> = SqlEntityManager<MsSqlDriver>, Entities extends readonly (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends SqlMikroORM<MsSqlDriver, EM, Entities> {
     /**
      * @inheritDoc
      */

package/MsSqlMikroORM.js

@@ -1,4 +1,5 @@
-import { defineConfig, MikroORM, } from '@mikro-orm/core';
+import { defineConfig, } from '@mikro-orm/core';
+import { SqlMikroORM } from '@mikro-orm/sql';
 import { MsSqlDriver } from './MsSqlDriver.js';
 /** Creates a type-safe configuration object for the MSSQL driver. */
 export function defineMsSqlConfig(options) {
@@ -7,7 +8,7 @@ export function defineMsSqlConfig(options) {
 /**
  * @inheritDoc
  */
-export class MsSqlMikroORM extends MikroORM {
+export class MsSqlMikroORM extends SqlMikroORM {
     /**
      * @inheritDoc
      */

package/MsSqlPlatform.js

@@ -154,16 +154,17 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
     getSearchJsonPropertyKey(path, type, aliased, value) {
         const [a, ...b] = path;
         /* v8 ignore next */
-        const root = this.quoteIdentifier(aliased ? `${ALIAS_REPLACEMENT}.${a}` : a);
+        const root = aliased ? `[${ALIAS_REPLACEMENT}].${this.quoteIdentifier(a)}` : this.quoteIdentifier(a);
         const types = {
             boolean: 'bit',
         };
         const cast = (key) => raw(type in types ? `cast(${key} as ${types[type]})` : key);
+        const jsonPath = this.quoteValue(`$.${b.map(this.quoteJsonKey).join('.')}`);
         /* v8 ignore next */
         if (path.length === 0) {
-            return cast(`json_value(${root}, '$.${b.map(this.quoteJsonKey).join('.')}')`);
+            return cast(`json_value(${root}, ${jsonPath})`);
         }
-        return cast(`json_value(${root}, '$.${b.map(this.quoteJsonKey).join('.')}')`);
+        return cast(`json_value(${root}, ${jsonPath})`);
     }
     getJsonArrayFromSQL(column, alias, properties) {
         const columns = properties
@@ -191,7 +192,7 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
         if (RawQueryFragment.isKnownFragment(id)) {
             return super.quoteIdentifier(id);
         }
-        return `[${id.toString().replace('.', `].[`)}]`;
+        return `[${id.toString().replaceAll(']', ']]').replace('.', `].[`)}]`;
     }
     escape(value) {
         if (value instanceof UnicodeString) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "7.1.0-dev.26",
+  "version": "7.1.0-dev.28",
   "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.26",
-    "kysely": "0.28.16",
+    "@mikro-orm/sql": "7.1.0-dev.28",
+    "kysely": "0.28.17",
     "tarn": "3.0.2",
     "tedious": "19.2.1",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.13"
+    "@mikro-orm/core": "^7.0.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.26"
+    "@mikro-orm/core": "7.1.0-dev.28"
   },
   "engines": {
     "node": ">= 22.17.0"