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

package/package.json

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

package/query/CriteriaNode.d.ts

@@ -17,6 +17,8 @@ export declare class CriteriaNode<T extends object> implements ICriteriaNode<T>
     index?: number;
     constructor(metadata: MetadataStorage, entityName: EntityName<T>, parent?: ICriteriaNode<T> | undefined, key?: EntityKey<T> | RawQueryFragmentSymbol | undefined, validate?: boolean, strict?: boolean);
     process(qb: IQueryBuilder<T>, options?: ICriteriaNodeProcessOptions): any;
+    /** Whether this node holds the condition for a single target of a polymorphic relation (e.g. `imageable[Article]`). */
+    isPolymorphicBranch(): boolean;
     unwrap(): any;
     shouldInline(payload: any): boolean;
     willAutoJoin(qb: IQueryBuilder<T>, alias?: string, options?: ICriteriaNodeProcessOptions): boolean;

package/query/CriteriaNode.js

@@ -1,4 +1,4 @@
-import { RawQueryFragment, ReferenceKind, Utils, inspect, } from '@mikro-orm/core';
+import { QueryHelper, RawQueryFragment, ReferenceKind, Utils, inspect, } from '@mikro-orm/core';
 /**
  * Helper for working with deeply nested where/orderBy/having criteria. Uses composite pattern to build tree from the payload.
  * Auto-joins relations and converts payload from { books: { publisher: { name: '...' } } } to { 'publisher_alias.name': '...' }
@@ -28,7 +28,9 @@ export class CriteriaNode {
                 return;
             }
             for (const k of pks) {
-                this.prop = meta.props.find(prop => prop.name === k || (prop.fieldNames?.length === 1 && prop.fieldNames[0] === k && prop.persist !== false));
+                const [name, target] = QueryHelper.splitPolymorphicKey(k);
+                this.prop = meta.props.find(prop => (prop.name === name && (!target || !!prop.polymorphTargets?.some(t => t.className === target))) ||
+                    (prop.fieldNames?.length === 1 && prop.fieldNames[0] === k && prop.persist !== false));
                 const isProp = this.prop || meta.props.find(prop => (prop.fieldNames || []).includes(k));
                 // do not validate if the key is prefixed or type casted (e.g. `k::text`)
                 if (validate && !isProp && !k.includes('.') && !k.includes('::') && !Utils.isOperator(k)) {
@@ -40,6 +42,10 @@ export class CriteriaNode {
     process(qb, options) {
         return this.payload;
     }
+    /** Whether this node holds the condition for a single target of a polymorphic relation (e.g. `imageable[Article]`). */
+    isPolymorphicBranch() {
+        return !!this.prop?.polymorphic && typeof this.key === 'string' && this.key.endsWith(']');
+    }
     unwrap() {
         return this.payload;
     }

package/query/CriteriaNodeFactory.js

@@ -1,4 +1,4 @@
-import { GroupOperator, isRaw, JsonType, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
+import { GroupOperator, isRaw, JsonType, QueryHelper, RawQueryFragment, ReferenceKind, Utils, ValidationError, } from '@mikro-orm/core';
 import { ObjectCriteriaNode } from './ObjectCriteriaNode.js';
 import { ArrayCriteriaNode } from './ArrayCriteriaNode.js';
 import { ScalarCriteriaNode } from './ScalarCriteriaNode.js';
@@ -50,8 +50,9 @@ export class CriteriaNodeFactory {
     }
     static createObjectItemNode(metadata, entityName, node, payload, key, meta, validate = true) {
         const rawField = RawQueryFragment.isKnownFragmentSymbol(key);
-        const prop = rawField ? null : meta?.properties[key];
-        const childEntity = prop && prop.kind !== ReferenceKind.SCALAR ? prop.targetMeta.class : entityName;
+        const prop = rawField ? null : meta?.properties[QueryHelper.splitPolymorphicKey(key)[0]];
+        const target = rawField ? undefined : QueryHelper.findTargetMeta(prop, key);
+        const childEntity = prop && prop.kind !== ReferenceKind.SCALAR ? (target ?? prop.targetMeta).class : entityName;
         const isNotEmbedded = rawField || prop?.kind !== ReferenceKind.EMBEDDED;
         const val = payload[key];
         if (isNotEmbedded && prop?.customType instanceof JsonType) {

package/query/ObjectCriteriaNode.js

@@ -99,7 +99,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             // with an exclusive condition on the join columns:
             // - if the owning column is null, the row is missing, we don't apply the filter
             // - if the target column is not null, the row is matched, we apply the filter
-            if (toOneProperty && this.prop.nullable && this.isStrict()) {
+            if (toOneProperty && this.prop.nullable && this.isStrict() && !this.isPolymorphicBranch()) {
                 const key = this.prop.owner ? this.prop.name : this.prop.referencedPKs;
                 qb.andWhere({
                     $or: [
@@ -109,7 +109,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 });
             }
         }
-        return keys.reduce((o, field) => {
+        const ret = keys.reduce((o, field) => {
             const childNode = this.payload[field];
             const payload = childNode.process(qb, { ...options, alias: this.prop ? alias : ownerAlias });
             const operator = Utils.isOperator(field);
@@ -149,6 +149,12 @@ export class ObjectCriteriaNode extends CriteriaNode {
             }
             return o;
         }, {});
+        // the target is left joined, so its condition must only match rows that point to it
+        if (this.isPolymorphicBranch() && alias) {
+            const pk = this.metadata.find(this.entityName).primaryKeys[0];
+            this.inlineCondition(`${alias}.${pk}`, ret, { $ne: null });
+        }
+        return ret;
     }
     isStrict() {
         return (this.strict ||
@@ -211,7 +217,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
         this.inlineCondition(key, obj, value);
     }
     inlineChildPayload(o, payload, field, alias, childAlias) {
-        const prop = this.metadata.find(this.entityName).properties[field];
+        const prop = this.payload[field].prop;
         for (const k of Utils.getObjectQueryKeys(payload)) {
             if (RawQueryFragment.isKnownFragmentSymbol(k)) {
                 o[k] = payload[k];
@@ -273,6 +279,10 @@ export class ObjectCriteriaNode extends CriteriaNode {
         if (keys.some(k => this.isCollectionOperator(k))) {
             return true;
         }
+        // the target's discriminator is checked in the join condition, so it is needed even for PK conditions
+        if (this.isPolymorphicBranch()) {
+            return !nestedAlias;
+        }
         const meta = this.metadata.find(this.entityName);
         const embeddable = this.prop.kind === ReferenceKind.EMBEDDED;
         const knownKey = [ReferenceKind.SCALAR, ReferenceKind.MANY_TO_ONE, ReferenceKind.EMBEDDED].includes(this.prop.kind) ||
@@ -317,6 +327,10 @@ export class ObjectCriteriaNode extends CriteriaNode {
         if (this.prop.kind === ReferenceKind.MANY_TO_MANY && (scalar || operator)) {
             qb.join(field, nestedAlias, undefined, JoinType.pivotJoin, path);
         }
+        else if (this.isPolymorphicBranch()) {
+            const targetMeta = this.metadata.find(this.entityName);
+            qb.addPolymorphicJoin(this.prop, targetMeta, alias, nestedAlias, JoinType.leftJoin, path);
+        }
         else {
             const prev = qb.state.fields?.slice();
             const toOneProperty = [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind);

package/typings.d.ts

@@ -1,5 +1,5 @@
 import type { Generated, Kysely } from 'kysely';
-import type { CheckCallback, DeferMode, Dictionary, EntityName, EntityProperty, EntitySchemaWithMeta, ExtractDefineEntityProperties, FilterQuery, GroupOperator, IndexColumnOptions, InferEntityName, Opt, Primary, PrimaryProperty, QueryFlag, QueryOrderMap, RawQueryFragment, RoutineIgnoreField, Scalar, Type } from '@mikro-orm/core';
+import type { CheckCallback, DeferMode, Dictionary, EntityName, EntityMetadata, EntityProperty, EntitySchemaWithMeta, ExtractDefineEntityProperties, FilterQuery, GroupOperator, IndexColumnOptions, InferEntityName, Opt, Primary, PrimaryProperty, QueryFlag, QueryOrderMap, RawQueryFragment, RoutineIgnoreField, Scalar, Type } from '@mikro-orm/core';
 import type { JoinType, QueryType } from './query/enums.js';
 import type { DatabaseSchema } from './schema/DatabaseSchema.js';
 import type { DatabaseTable } from './schema/DatabaseTable.js';
@@ -295,6 +295,8 @@ export interface IQueryBuilder<T> {
     scheduleFilterCheck(path: string): void;
     /** @internal */
     ensureTPTJoins(): void;
+    /** @internal */
+    addPolymorphicJoin(prop: EntityProperty, targetMeta: EntityMetadata, ownerAlias: string, alias: string, type: JoinType, path: string, schema?: string): void;
     withSchema(schema: string): this;
 }
 export interface ICriteriaNodeProcessOptions {