@mikro-orm/sql 7.0.11-dev.13 → 7.0.11-dev.14

package/AbstractSqlDriver.d.ts

@@ -123,7 +123,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
      * This method reads the discriminator to determine the concrete type and maps child-specific fields.
      * @internal
      */
-    protected mapTPTChildFields<T extends object>(relationPojo: EntityData<T>, meta: EntityMetadata<T>, relationAlias: string, qb: AnyQueryBuilder<T>, root: EntityData<T>): void;
+    protected mapTPTChildFields<T extends object>(relationPojo: EntityData<T>, meta: EntityMetadata<T>, relationAlias: string, qb: AnyQueryBuilder<T>, root: EntityData<T>): EntityMetadata | undefined;
     /**
      * @internal
      */

package/AbstractSqlDriver.js

@@ -328,9 +328,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
                         for (const p of targetProps) {
                             this.mapJoinedProp(relationPojo, p, relationAlias, root, tz, meta2);
                         }
-                        // Inject the entity class constructor so that the factory creates the correct type
+                        // For TPT base targets, map child-specific fields and resolve the
+                        // concrete class so the factory creates the correct subtype.
+                        const concreteMeta = this.mapTPTChildFields(relationPojo, meta2, relationAlias, qb, root);
                         Object.defineProperty(relationPojo, 'constructor', {
-                            value: meta2.class,
+                            value: concreteMeta?.class ?? meta2.class,
                             enumerable: false,
                             configurable: true,
                         });
@@ -1439,6 +1441,12 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     const targetPath = `${pathPrefix}${basePath}[${targetMeta.className}]`;
                     const schema = targetMeta.schema === '*' ? (options?.schema ?? this.config.get('schema')) : targetMeta.schema;
                     qb.addPolymorphicJoin(prop, targetMeta, options.parentTableAlias, tableAlias, JoinType.leftJoin, targetPath, schema);
+                    // For polymorphic targets that are TPT base classes, also LEFT JOIN
+                    // all descendant tables so child-specific fields can be selected.
+                    if (targetMeta.inheritanceType === 'tpt' && targetMeta.tptChildren?.length && !ref) {
+                        const tptMeta = this.metadata.get(targetMeta.class);
+                        this.addTPTPolymorphicJoinsForRelation(qb, tptMeta, tableAlias, fields);
+                    }
                     if (ref) {
                         // For filter :ref hints, schedule filter check for each target (no field selection)
                         qb.scheduleFilterCheck(targetPath);
@@ -1600,29 +1608,24 @@ export class AbstractSqlDriver extends DatabaseDriver {
      * @internal
      */
     mapTPTChildFields(relationPojo, meta, relationAlias, qb, root) {
-        // Check if this is a TPT base with polymorphic children
         if (meta.inheritanceType !== 'tpt' || !meta.root.tptDiscriminatorColumn) {
             return;
         }
-        // Read the discriminator value
         const discriminatorAlias = `${relationAlias}__${meta.root.tptDiscriminatorColumn}`;
         const discriminatorValue = root[discriminatorAlias];
         if (!discriminatorValue) {
             return;
         }
-        // Set the discriminator in the pojo for EntityFactory
         relationPojo[meta.root.tptDiscriminatorColumn] = discriminatorValue;
-        // Find the concrete metadata from discriminator map
         const concreteClass = meta.root.discriminatorMap?.[discriminatorValue];
         /* v8 ignore next 3 - defensive check for invalid discriminator values */
         if (!concreteClass) {
             return;
         }
         const concreteMeta = this.metadata.get(concreteClass);
+        delete root[discriminatorAlias];
         if (concreteMeta === meta) {
-            // Already the concrete type, no child fields to map
-            delete root[discriminatorAlias];
-            return;
+            return concreteMeta;
         }
         // Traverse up from concrete type and map fields from each level's table
         const tz = this.platform.getTimezone();
@@ -1639,8 +1642,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             }
             currentMeta = currentMeta.tptParent;
         }
-        // Clean up the discriminator alias
-        delete root[discriminatorAlias];
+        return concreteMeta;
     }
     /**
      * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.11-dev.13",
+  "version": "7.0.11-dev.14",
   "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.0.10"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.11-dev.13"
+    "@mikro-orm/core": "7.0.11-dev.14"
   },
   "engines": {
     "node": ">= 22.17.0"