@mikro-orm/core 7.0.12-dev.2 → 7.0.12-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.12-dev.2",
+  "version": "7.0.12-dev.4",
   "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",

package/utils/QueryHelper.d.ts

@@ -38,6 +38,11 @@ export declare class QueryHelper {
      * Handles shared FK columns (e.g., tenant_id referenced by multiple FKs) correctly.
      */
     private static extractJoinColumnValues;
+    /**
+     * Expands a polymorphic entity reference to `[discriminatorValue, ...joinColumnValues]`,
+     * matching the column order of `prop.fieldNames`.
+     */
+    private static extractPolymorphicJoinColumnValues;
     /**
      * Extracts the value for a specific column from an entity by finding which PK property
      * owns that column and recursively traversing FK references.

package/utils/QueryHelper.js

@@ -327,18 +327,29 @@ export class QueryHelper {
                 continue;
             }
             const prop = meta.properties[k];
-            if (!prop?.joinColumns || prop.joinColumns.length <= 1) {
+            const polymorphic = !!prop?.polymorphic && (prop.fieldNames?.length ?? 0) > 1;
+            const composite = (prop?.joinColumns?.length ?? 0) > 1;
+            if (!polymorphic && !composite) {
                 continue;
             }
+            const expand = (entity) => polymorphic
+                ? this.extractPolymorphicJoinColumnValues(entity, prop)
+                : this.extractJoinColumnValues(entity, prop);
+            const expandItem = (item) => {
+                const entity = Reference.isReference(item) ? item.unwrap() : item;
+                return Utils.isEntity(entity) ? expand(entity) : item;
+            };
             const w = where[k];
-            if (Utils.isEntity(w)) {
-                where[k] = this.extractJoinColumnValues(w, prop);
+            const expanded = expandItem(w);
+            if (expanded !== w) {
+                where[k] = expanded;
             }
             else if (Utils.isPlainObject(w)) {
                 for (const op of Object.keys(w)) {
-                    if (Utils.isOperator(op, false) && Array.isArray(w[op])) {
-                        w[op] = w[op].map((item) => Utils.isEntity(item) ? this.extractJoinColumnValues(item, prop) : item);
+                    if (!Utils.isOperator(op, false)) {
+                        continue;
                     }
+                    w[op] = Array.isArray(w[op]) ? w[op].map(expandItem) : expandItem(w[op]);
                 }
             }
         }
@@ -352,6 +363,14 @@ export class QueryHelper {
             return this.extractColumnValue(entity, prop.targetMeta, refCol);
         });
     }
+    /**
+     * Expands a polymorphic entity reference to `[discriminatorValue, ...joinColumnValues]`,
+     * matching the column order of `prop.fieldNames`.
+     */
+    static extractPolymorphicJoinColumnValues(entity, prop) {
+        const discriminator = this.findDiscriminatorValue(prop.discriminatorMap, entity.constructor);
+        return [discriminator, ...this.extractJoinColumnValues(entity, prop)];
+    }
     /**
      * Extracts the value for a specific column from an entity by finding which PK property
      * owns that column and recursively traversing FK references.

package/utils/Utils.js

@@ -141,7 +141,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.12-dev.2';
+    static #ORM_VERSION = '7.0.12-dev.4';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */