@mikro-orm/sql 7.1.11-dev.6 → 7.1.11-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.11-dev.6",
+  "version": "7.1.11-dev.8",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.11-dev.6"
+    "@mikro-orm/core": "7.1.11-dev.8"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/DatabaseTable.d.ts

@@ -49,6 +49,8 @@ export declare class DatabaseTable {
     getEntityDeclaration(namingStrategy: NamingStrategy, schemaHelper: SchemaHelper, scalarPropertiesForRelations: 'always' | 'never' | 'smart'): EntityMetadata;
     private foreignKeysToProps;
     private findFkIndex;
+    /** Advanced options require an entity-level declaration, as the property-level `index`/`unique` cannot carry them. */
+    private hasAdvancedIndexOptions;
     private getIndexProperties;
     private getSafeBaseNameForFkProp;
     /**

package/schema/DatabaseTable.js

@@ -220,6 +220,7 @@ export class DatabaseTable {
                 index.deferMode ||
                 index.expression ||
                 index.where ||
+                this.hasAdvancedIndexOptions(index) ||
                 !(index.columnNames[0] in columnFks)) && // Trivial non-composite indexes for scalar props are to be mapped to the column.
             // ignore indexes that don't have all column names (this can happen in sqlite where there is no way to infer this for expressions)
             !(index.columnNames.some(col => !col) && !index.expression));
@@ -255,14 +256,7 @@ export class DatabaseTable {
                 }
             }
             // An index is trivial if it has no special options that require entity-level declaration
-            const hasAdvancedOptions = index.columns?.length ||
-                index.include?.length ||
-                index.fillFactor ||
-                index.type ||
-                index.invisible ||
-                index.disabled ||
-                index.clustered;
-            const isTrivial = !index.deferMode && !index.expression && !index.where && !hasAdvancedOptions;
+            const isTrivial = !index.deferMode && !index.expression && !index.where && !this.hasAdvancedIndexOptions(index);
             if (isTrivial) {
                 // Index is for FK. Map to the FK prop and move on.
                 const fkForIndex = fkIndexes.get(index);
@@ -522,6 +516,7 @@ export class DatabaseTable {
         const fkColumnsLength = currentFk.columnNames.length;
         const possibleIndexes = this.#indexes.filter(index => {
             return (!index.where &&
+                !this.hasAdvancedIndexOptions(index) &&
                 index.columnNames.length === fkColumnsLength &&
                 !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName));
         });
@@ -536,6 +531,16 @@ export class DatabaseTable {
         });
         return possibleIndexes.at(0);
     }
+    /** Advanced options require an entity-level declaration, as the property-level `index`/`unique` cannot carry them. */
+    hasAdvancedIndexOptions(index) {
+        return !!(index.columns?.length ||
+            index.include?.length ||
+            index.fillFactor ||
+            index.type ||
+            index.invisible ||
+            index.disabled ||
+            index.clustered);
+    }
     getIndexProperties(index, columnFks, fksOnColumnProps, fksOnStandaloneProps, namingStrategy) {
         const propBaseNames = new Map();
         const columnNames = index.columnNames;
@@ -720,9 +725,19 @@ export class DatabaseTable {
         const prop = this.getPropertyName(namingStrategy, column.name, fk);
         const persist = !(column.name in columnFks && typeof fk === 'undefined');
         const index = compositeFkIndexes[prop] ||
-            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && !idx.unique && !idx.primary && !idx.where);
+            this.#indexes.find(idx => idx.columnNames[0] === column.name &&
+                !idx.composite &&
+                !idx.unique &&
+                !idx.primary &&
+                !idx.where &&
+                !this.hasAdvancedIndexOptions(idx));
         const unique = compositeFkUniques[prop] ||
-            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary && !idx.where);
+            this.#indexes.find(idx => idx.columnNames[0] === column.name &&
+                !idx.composite &&
+                idx.unique &&
+                !idx.primary &&
+                !idx.where &&
+                !this.hasAdvancedIndexOptions(idx));
         const kind = this.getReferenceKind(fk, unique);
         const runtimeType = this.getPropertyTypeForColumn(namingStrategy, column, fk);
         const type = fk