@mikro-orm/sql 7.2.5-dev.9 → 7.2.5

package/AbstractSqlDriver.js

@@ -853,10 +853,16 @@ export class AbstractSqlDriver extends DatabaseDriver {
                         // the map misses subtypes whose props were not initialized yet during discovery (root column owner, grandchildren)
                         const discriminator = row[meta.discriminatorColumn];
                         const childClass = meta.discriminatorMap?.[discriminator];
-                        const activeField = prop.stiFieldNameMap[discriminator] ??
-                            (childClass && this.metadata.find(childClass)?.properties[prop.name]?.fieldNames[0]);
+                        const childProp = childClass && this.metadata.find(childClass)?.properties[prop.name];
+                        const activeField = prop.stiFieldNameMap[discriminator] ?? childProp?.fieldNames[0];
                         for (const field of prop.stiFieldNames) {
-                            params.push(field === activeField ? (row[prop.name] ?? null) : null);
+                            // the subtype's own property, as siblings can declare it with a different type or embeddable
+                            if (field === activeField) {
+                                addParams(childProp ?? prop, row);
+                            }
+                            else {
+                                params.push(null);
+                            }
                             keys.push('?');
                         }
                         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.5-dev.9",
+  "version": "7.2.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",
@@ -50,10 +50,10 @@
     "kysely": "0.29.6"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.2.4"
+    "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.5-dev.9"
+    "@mikro-orm/core": "7.2.5"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -1873,20 +1873,7 @@ export class QueryBuilder {
         if (meta.root.inheritanceType !== 'sti' || !meta.discriminatorValue) {
             return;
         }
-        const types = Object.values(meta.root.discriminatorMap).map(cls => this.metadata.get(cls));
-        const children = [];
-        const lookUpChildren = (ret, parent) => {
-            const children = types.filter(meta2 => meta2.extends && this.metadata.find(meta2.extends) === parent);
-            children.forEach(m => lookUpChildren(ret, m));
-            ret.push(...children.filter(c => c.discriminatorValue));
-            return children;
-        };
-        lookUpChildren(children, meta);
-        this.andWhere({
-            [meta.root.discriminatorColumn]: children.length > 0
-                ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] }
-                : meta.discriminatorValue,
-        });
+        this.andWhere({ [meta.root.discriminatorColumn]: this.helper.getDiscriminatorCondition(meta) });
     }
     /**
      * Ensures TPT joins are applied. Can be called early before finalize() to populate

package/query/QueryBuilderHelper.d.ts

@@ -30,6 +30,8 @@ export declare class QueryBuilderHelper {
         sql: string;
         params: unknown[];
     };
+    /** STI discriminator condition matching the entity and all its subclasses. */
+    getDiscriminatorCondition(meta: EntityMetadata): unknown;
     mapJoinColumns(type: QueryType, join: JoinOptions): (string | Raw)[];
     isOneToOneInverse(field: string, meta?: EntityMetadata): boolean;
     getTableName(entityName: EntityName): string;

package/query/QueryBuilderHelper.js

@@ -296,7 +296,7 @@ export class QueryBuilderHelper {
             !join.path?.endsWith('[pivot]')) {
             const typeProperty = join.prop.targetMeta.root.discriminatorColumn;
             const alias = join.inverseAlias ?? join.alias;
-            join.cond[`${alias}.${typeProperty}`] = join.prop.targetMeta.discriminatorValue;
+            join.cond[`${alias}.${typeProperty}`] = this.getDiscriminatorCondition(join.prop.targetMeta);
         }
         // For polymorphic relations, add discriminator condition to filter by target entity type
         if (join.prop.polymorphic && join.prop.discriminatorColumn && join.prop.discriminatorMap) {
@@ -341,6 +341,22 @@ export class QueryBuilderHelper {
         }
         return { sql, params };
     }
+    /** STI discriminator condition matching the entity and all its subclasses. */
+    getDiscriminatorCondition(meta) {
+        const types = Object.values(meta.root.discriminatorMap).map(cls => this.#metadata.get(cls));
+        const children = [];
+        const lookUpChildren = (ret, parent) => {
+            const children = types.filter(meta2 => meta2.extends && this.#metadata.find(meta2.extends) === parent);
+            children.forEach(m => lookUpChildren(ret, m));
+            ret.push(...children.filter(c => c.discriminatorValue));
+            return children;
+        };
+        // resolve from storage, `prop.targetMeta` can be a copy that fails the identity check above
+        lookUpChildren(children, this.#metadata.get(meta.class));
+        return children.length > 0
+            ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] }
+            : meta.discriminatorValue;
+    }
     mapJoinColumns(type, join) {
         if (join.prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(join.prop.kind)) {
             return join.prop.fieldNames.map((_fieldName, idx) => {