@mikro-orm/mssql 7.1.0-dev.13 → 7.1.0-dev.15

package/MsSqlSchemaHelper.d.ts

@@ -6,6 +6,8 @@ export declare class MsSqlSchemaHelper extends SchemaHelper {
         false: string[];
         'getdate()': string[];
     };
+    private static readonly AUTO_NOT_NULL_RE;
+    protected get bracketQuotedIdentifiers(): boolean;
     getManagementDbName(): string;
     getDropDatabaseSQL(name: string): string;
     disableForeignKeysSQL(): string;

package/MsSqlSchemaHelper.js

@@ -7,6 +7,16 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         false: ['0'],
         'getdate()': ['current_timestamp'],
     };
+    // `stripAutoNotNullFilter` unwraps balanced per-clause parens before calling `.exec`, so we
+    // only need to match the bare form here — previously the pattern allowed independently
+    // optional leading/trailing parens, which accepted unbalanced strings like `([col] IS NOT NULL`.
+    static AUTO_NOT_NULL_RE = /^\[([^\]]+)\]\s+IS\s+NOT\s+NULL$/i;
+    // MSSQL `filter_definition` and `where` predicates use `[…]` bracket-quoting for identifiers,
+    // so `splitTopLevelAnd` must treat `[` as opening a quoted span (otherwise `[some and col]`
+    // would split mid-identifier).
+    get bracketQuotedIdentifiers() {
+        return true;
+    }
     getManagementDbName() {
         return 'master';
     }
@@ -148,6 +158,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       col.name as column_name,
       schema_name(t.schema_id) as schema_name,
       (case when filter_definition is not null then concat('where ', filter_definition) else null end) as expression,
+      filter_definition as filter_definition,
       ind.is_disabled as is_disabled,
       ind.type as index_type,
       ind.fill_factor as fill_factor,
@@ -192,15 +203,31 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             if (index.fill_factor > 0) {
                 indexDef.fillFactor = index.fill_factor;
             }
-            if (index.column_name?.match(/[(): ,"'`]/) || index.expression?.match(/where /i)) {
-                indexDef.expression = index.expression; // required for the `getCreateIndexSQL()` call
+            /* v8 ignore next: function-based / computed-column introspection path, same as pre-PR */
+            if (index.column_name?.match(/[(): ,"'`]/)) {
+                indexDef.expression = index.expression;
                 indexDef.expression = this.getCreateIndexSQL(index.table_name, indexDef, !!index.expression);
             }
+            else if (index.filter_definition) {
+                // Auto-NOT-NULL stripping runs post-mapIndexes (needs the consolidated column list).
+                indexDef.where = index.filter_definition;
+            }
             ret[key] ??= [];
             ret[key].push(indexDef);
         }
         for (const key of Object.keys(ret)) {
             ret[key] = await this.mapIndexes(ret[key]);
+            for (const idx of ret[key]) {
+                if (idx.where) {
+                    const stripped = this.stripAutoNotNullFilter(idx.where, idx.columnNames, MsSqlSchemaHelper.AUTO_NOT_NULL_RE);
+                    if (stripped === '') {
+                        delete idx.where;
+                    }
+                    else {
+                        idx.where = stripped;
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -540,7 +567,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         const clustered = index.clustered ? 'clustered ' : '';
         let sql = `create ${index.unique ? 'unique ' : ''}${clustered}index ${keyName} on ${this.quote(tableName)} `;
         if (index.expression && partialExpression) {
-            return sql + `(${index.expression})` + this.getMsSqlIndexSuffix(index);
+            return sql + `(${index.expression})` + this.getMsSqlIndexSuffix(index) + this.getIndexWhereClause(index);
         }
         // Build column list with advanced options
         const columns = this.getIndexColumns(index);
@@ -549,7 +576,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         if (index.include?.length) {
             sql += ` include (${index.include.map(c => this.quote(c)).join(', ')})`;
         }
-        sql += this.getMsSqlIndexSuffix(index);
+        sql += this.getMsSqlIndexSuffix(index) + this.getIndexWhereClause(index);
         // Disabled indexes need to be created first, then disabled
         if (index.disabled) {
             sql += `;\nalter index ${keyName} on ${this.quote(tableName)} disable`;
@@ -594,13 +621,16 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         if (index.expression) {
             return index.expression;
         }
-        const needsWhereClause = index.unique && index.columnNames.some(column => table.getColumn(column)?.nullable);
-        if (!needsWhereClause) {
+        const needsAutoNotNull = index.unique && index.columnNames.some(column => table.getColumn(column)?.nullable);
+        if (!needsAutoNotNull) {
             return this.getCreateIndexSQL(table.getShortestName(), index);
         }
-        // Generate without disabled suffix, insert WHERE clause, then re-add disabled
-        let sql = this.getCreateIndexSQL(table.getShortestName(), { ...index, disabled: false });
-        sql += ' where ' + index.columnNames.map(c => `${this.quote(c)} is not null`).join(' and ');
+        // Strip `index.where` from the base SQL so we can combine it with the auto NOT-NULL guard
+        // ourselves, wrapping the user predicate in parens to defuse operator precedence
+        // (a bare `a = 1 or b = 2 and [col] is not null` would bind as `a = 1 or (b = 2 and …)`).
+        let sql = this.getCreateIndexSQL(table.getShortestName(), { ...index, where: undefined, disabled: false });
+        const autoNotNull = index.columnNames.map(c => `${this.quote(c)} is not null`).join(' and ');
+        sql += index.where ? ` where (${index.where}) and ${autoNotNull}` : ` where ${autoNotNull}`;
         if (index.disabled) {
             sql += `;\nalter index ${this.quote(index.keyName)} on ${table.getQuotedName()} disable`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "7.1.0-dev.13",
+  "version": "7.1.0-dev.15",
   "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.1.0-dev.13",
+    "@mikro-orm/sql": "7.1.0-dev.15",
     "kysely": "0.28.16",
     "tarn": "3.0.2",
     "tedious": "19.2.1",
@@ -57,7 +57,7 @@
     "@mikro-orm/core": "^7.0.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.13"
+    "@mikro-orm/core": "7.1.0-dev.15"
   },
   "engines": {
     "node": ">= 22.17.0"