@mikro-orm/sql 7.0.3-dev.13 → 7.0.3-dev.15

package/AbstractSqlDriver.js

@@ -1412,10 +1412,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const [propName, ref] = hint.field.split(':', 2);
             const prop = meta.properties[propName];
             // Polymorphic to-one: create a LEFT JOIN per target type
-            // Skip :ref hints — polymorphic to-one already has FK + discriminator in the row
+            // Skip regular :ref hints — polymorphic to-one already has FK + discriminator in the row
+            // But allow filter :ref hints through to create per-target LEFT JOINs with filter checks
             if (prop.polymorphic &&
                 prop.polymorphTargets?.length &&
-                !ref &&
+                (!ref || hint.filter) &&
                 [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind)) {
                 const basePath = options.parentJoinPath
                     ? `${options.parentJoinPath}.${prop.name}`
@@ -1426,13 +1427,19 @@ 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);
-                    // Select fields from each target table
-                    fields.push(...this.getFieldsForJoinedLoad(qb, targetMeta, {
-                        ...options,
-                        populate: hint.children,
-                        parentTableAlias: tableAlias,
-                        parentJoinPath: targetPath,
-                    }));
+                    if (ref) {
+                        // For filter :ref hints, schedule filter check for each target (no field selection)
+                        qb.scheduleFilterCheck(targetPath);
+                    }
+                    else {
+                        // Select fields from each target table
+                        fields.push(...this.getFieldsForJoinedLoad(qb, targetMeta, {
+                            ...options,
+                            populate: hint.children,
+                            parentTableAlias: tableAlias,
+                            parentJoinPath: targetPath,
+                        }));
+                    }
                 }
                 continue;
             }
@@ -1521,13 +1528,10 @@ export class AbstractSqlDriver extends DatabaseDriver {
             childAliases[childMeta.className] = childAlias;
             qb.addPropertyJoin(childMeta.tptInverseProp, baseAlias, childAlias, JoinType.leftJoin, `[tpt]${meta.className}`);
             // Add fields from this child (only ownProps, skip PKs)
-            for (const prop of childMeta.ownProps.filter(p => !p.primary && this.platform.shouldHaveColumn(p, []))) {
-                for (const fieldName of prop.fieldNames) {
-                    const field = `${childAlias}.${fieldName}`;
-                    const fieldAlias = `${childAlias}__${fieldName}`;
-                    fields.push(raw(`${this.platform.quoteIdentifier(field)} as ${this.platform.quoteIdentifier(fieldAlias)}`));
-                }
-            }
+            const schema = childMeta.schema === '*' ? '*' : this.getSchemaName(childMeta);
+            childMeta
+                .ownProps.filter(p => !p.primary && this.platform.shouldHaveColumn(p, []))
+                .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, childAlias, childMeta, schema)));
         }
         // Add computed discriminator (descendants already sorted by depth)
         if (meta.root.tptDiscriminatorColumn) {

package/package.json

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

package/query/QueryBuilder.js

@@ -391,6 +391,26 @@ export class QueryBuilder {
                 else {
                     join.cond = { ...cond };
                 }
+                // For polymorphic LEFT JOIN filters, add a WHERE condition to enforce the filter
+                // only for rows matching this target's discriminator value. This ensures rows pointing
+                // to other polymorphic targets are not excluded.
+                if (join.prop.polymorphic &&
+                    join.prop.targetMeta &&
+                    join.type === JoinType.leftJoin &&
+                    join.prop.discriminatorColumn &&
+                    join.prop.discriminatorMap) {
+                    const discriminatorValue = QueryHelper.findDiscriminatorValue(join.prop.discriminatorMap, join.prop.targetMeta.class);
+                    if (discriminatorValue) {
+                        const pks = join.prop.targetMeta.primaryKeys;
+                        this.andWhere({
+                            $or: [
+                                { [`${join.ownerAlias}.${join.prop.discriminatorColumn}`]: null },
+                                { [`${join.ownerAlias}.${join.prop.discriminatorColumn}`]: { $ne: discriminatorValue } },
+                                { [`${join.alias}.${Utils.getPrimaryKeyHash(pks)}`]: { $ne: null } },
+                            ],
+                        });
+                    }
+                }
             }
         }
     }