@mikro-orm/sql 7.0.12-dev.1 → 7.0.12-dev.10

package/package.json

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

package/query/CriteriaNode.d.ts

@@ -21,7 +21,7 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string, options?: ICriteriaNodeProcessOptions): string;
     getPath(opts?: {
         addIndex?: boolean;
         parentPath?: string;

package/query/CriteriaNode.js

@@ -51,7 +51,15 @@ export class CriteriaNode {
     }
     shouldRename(payload) {
         const type = this.prop ? this.prop.kind : null;
-        const composite = this.prop?.joinColumns ? this.prop.joinColumns.length > 1 : false;
+        // Polymorphic relations have a composite column set (discriminator + FK), but we only
+        // need tuple-renaming when the payload is itself a tuple (entity ref expanded by
+        // `convertCompositeEntityRefs`) or an array-valued operator like `$in`. Scalar payloads
+        // such as `null` or `{ $ne: null }` keep single-column semantics against `fieldNames[0]`.
+        const polymorphicComposite = !!this.prop?.polymorphic &&
+            (this.prop.fieldNames?.length ?? 0) > 1 &&
+            (Array.isArray(payload) ||
+                (Utils.isPlainObject(payload) && Object.values(payload).some(v => Array.isArray(v))));
+        const composite = polymorphicComposite || (this.prop?.joinColumns ? this.prop.joinColumns.length > 1 : false);
         const rawField = RawQueryFragment.isKnownFragmentSymbol(this.key);
         const scalar = payload === null ||
             Utils.isPrimaryKey(payload) ||
@@ -75,14 +83,15 @@ export class CriteriaNode {
                 return false;
         }
     }
-    renameFieldToPK(qb, ownerAlias) {
-        const joinAlias = qb.getAliasForJoinPath(this.getPath(), { matchPopulateJoins: true });
+    renameFieldToPK(qb, ownerAlias, options) {
+        const joinAlias = qb.getAliasForJoinPath(this.getPath(), { ...options, matchPopulateJoins: true });
         if (!joinAlias &&
             this.parent &&
             [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) &&
             this.prop.owner) {
             const alias = qb.getAliasForJoinPath(this.parent.getPath()) ?? ownerAlias ?? qb.alias;
-            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
+            const columns = this.prop.polymorphic ? this.prop.fieldNames : this.prop.joinColumns;
+            return Utils.getPrimaryKeyHash(columns.map(col => `${alias}.${col}`));
         }
         const alias = joinAlias ?? ownerAlias ?? qb.alias;
         if (this.prop.kind === ReferenceKind.MANY_TO_MANY) {

package/query/ObjectCriteriaNode.js

@@ -105,7 +105,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 this.inlineChildPayload(o, payload, field, a, childAlias);
             }
             else if (childNode.shouldRename(payload)) {
-                this.inlineCondition(childNode.renameFieldToPK(qb, alias), o, payload);
+                this.inlineCondition(childNode.renameFieldToPK(qb, alias, options), o, payload);
             }
             else if (isRawField) {
                 const rawField = RawQueryFragment.getKnownFragment(field);

package/typings.d.ts

@@ -233,7 +233,7 @@ export interface ICriteriaNode<T extends object> {
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;
     shouldRename(payload: any): boolean;
-    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string): string;
+    renameFieldToPK<T>(qb: IQueryBuilder<T>, ownerAlias?: string, options?: ICriteriaNodeProcessOptions): string;
     getPath(opts?: {
         addIndex?: boolean;
     }): string;