@mikro-orm/sql 7.1.11-dev.4 → 7.1.11-dev.5

package/package.json

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

package/schema/DatabaseTable.js

@@ -219,6 +219,7 @@ export class DatabaseTable {
                 skippedColumnNames.includes(index.columnNames[0]) || // Non-composite indexes for skipped columns are to be mapped as entity decorators.
                 index.deferMode ||
                 index.expression ||
+                index.where ||
                 !(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));
@@ -507,7 +508,8 @@ export class DatabaseTable {
     findFkIndex(currentFk) {
         const fkColumnsLength = currentFk.columnNames.length;
         const possibleIndexes = this.#indexes.filter(index => {
-            return (index.columnNames.length === fkColumnsLength &&
+            return (!index.where &&
+                index.columnNames.length === fkColumnsLength &&
                 !currentFk.columnNames.some((columnName, i) => index.columnNames[i] !== columnName));
         });
         possibleIndexes.sort((a, b) => {
@@ -522,12 +524,20 @@ export class DatabaseTable {
         return possibleIndexes.at(0);
     }
     getIndexProperties(index, columnFks, fksOnColumnProps, fksOnStandaloneProps, namingStrategy) {
-        const propBaseNames = new Set();
+        const propBaseNames = new Map();
         const columnNames = index.columnNames;
         const l = columnNames.length;
         if (columnNames.some(col => !col)) {
             return;
         }
+        const addPropBaseName = (baseName, position) => {
+            const positions = propBaseNames.get(baseName);
+            if (positions) {
+                positions.last = position;
+                return;
+            }
+            propBaseNames.set(baseName, { first: position, last: position });
+        };
         for (let i = 0; i < l; ++i) {
             const columnName = columnNames[i];
             // The column is not involved with FKs.
@@ -538,14 +548,14 @@ export class DatabaseTable {
                 }
                 // It has a prop named after it.
                 // Add it and move on.
-                propBaseNames.add(columnName);
+                addPropBaseName(columnName, i);
                 continue;
             }
             // If the prop named after the column has a FK and the FK's columns are a subset of this index,
             // include this prop and move on.
             const columnPropFk = fksOnColumnProps.get(columnName);
             if (columnPropFk && !columnPropFk.columnNames.some(fkColumnName => !columnNames.includes(fkColumnName))) {
-                propBaseNames.add(columnName);
+                addPropBaseName(columnName, i);
                 continue;
             }
             // If there is at least one standalone FK featuring this column,
@@ -557,7 +567,7 @@ export class DatabaseTable {
                     continue;
                 }
                 if (!fk.columnNames.some(fkColumnName => !columnNames.includes(fkColumnName))) {
-                    propBaseNames.add(propName);
+                    addPropBaseName(propName, i);
                     propAdded = true;
                 }
             }
@@ -568,7 +578,10 @@ export class DatabaseTable {
             // Break the whole prop creation.
             return;
         }
-        return Array.from(propBaseNames).map(baseName => this.getPropertyName(namingStrategy, baseName, fksOnColumnProps.get(baseName)));
+        // Props sharing their first column would otherwise follow FK discovery order, so break ties on the last one.
+        return Array.from(propBaseNames)
+            .sort(([, a], [, b]) => a.first - b.first || a.last - b.last)
+            .map(([baseName]) => this.getPropertyName(namingStrategy, baseName, fksOnColumnProps.get(baseName)));
     }
     getSafeBaseNameForFkProp(namingStrategy, currentFk, fks, columnName) {
         if (columnName &&
@@ -694,9 +707,9 @@ 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);
+            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && !idx.unique && !idx.primary && !idx.where);
         const unique = compositeFkUniques[prop] ||
-            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary);
+            this.#indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary && !idx.where);
         const kind = this.getReferenceKind(fk, unique);
         const runtimeType = this.getPropertyTypeForColumn(namingStrategy, column, fk);
         const type = fk

package/typings.d.ts

@@ -368,9 +368,9 @@ type MaybeGenerated<TValue, TOptions, TProcessOnCreate extends boolean> = TOptio
 } ? TValue | null : TOptions extends {
     autoincrement: true;
 } ? Generated<TValue> : TOptions extends {
-    default: true;
+    default: unknown;
 } ? Generated<TValue> : TOptions extends {
-    defaultRaw: true;
+    defaultRaw: unknown;
 } ? Generated<TValue> : TProcessOnCreate extends false ? TValue : TOptions extends {
     onCreate: Function;
 } ? Generated<TValue> : TValue;