@mikro-orm/sql 7.0.9-dev.1 → 7.0.9-dev.2

package/AbstractSqlDriver.js

@@ -1479,6 +1479,20 @@ export class AbstractSqlDriver extends DatabaseDriver {
                         : JoinType.leftJoin;
             const schema = prop.targetMeta.schema === '*' ? (options?.schema ?? this.config.get('schema')) : prop.targetMeta.schema;
             qb.join(field, tableAlias, {}, joinType, path, schema);
+            // For relations to TPT child entities, INNER JOIN parent tables (GH #7469)
+            if (meta2.inheritanceType === 'tpt' && meta2.tptParent) {
+                let childAlias = tableAlias;
+                let childMeta = meta2;
+                while (childMeta.tptParent) {
+                    const parentMeta = childMeta.tptParent;
+                    const parentAlias = qb.getNextAlias(parentMeta.className);
+                    qb.createAlias(parentMeta.class, parentAlias);
+                    qb.state.tptAlias[`${tableAlias}:${parentMeta.className}`] = parentAlias;
+                    qb.addPropertyJoin(childMeta.tptParentProp, childAlias, parentAlias, JoinType.innerJoin, `${path}.[tpt]${childMeta.className}`);
+                    childAlias = parentAlias;
+                    childMeta = parentMeta;
+                }
+            }
             // For relations to TPT base classes, add LEFT JOINs for all child tables (polymorphic loading)
             if (meta2.inheritanceType === 'tpt' && meta2.tptChildren?.length && !ref) {
                 // Use the registry metadata to ensure allTPTDescendants is available
@@ -1662,8 +1676,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const columns = meta.createColumnMappingObject(tableAlias);
             return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
         }
+        const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
         return prop.fieldNames.map(fieldName => {
-            return raw('?? as ??', [`${tableAlias}.${fieldName}`, `${tableAlias}__${fieldName}`]);
+            return raw('?? as ??', [`${sourceAlias}.${fieldName}`, `${tableAlias}__${fieldName}`]);
         });
     }
     /** @internal */

package/package.json

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

package/query/QueryBuilderHelper.js

@@ -40,7 +40,7 @@ export class QueryBuilderHelper {
         // Walk up the TPT hierarchy to find which parent owns this property
         let parentMeta = meta.tptParent;
         while (parentMeta) {
-            const parentAlias = this.#tptAliasMap[parentMeta.className];
+            const parentAlias = this.#tptAliasMap[`${defaultAlias}:${parentMeta.className}`] ?? this.#tptAliasMap[parentMeta.className];
             if (parentAlias && parentMeta.ownProps?.some(p => p.name === propName || p.fieldNames?.includes(propName))) {
                 return parentAlias;
             }