@mikro-orm/knex 6.0.0-dev.69 → 6.0.0-dev.70

package/SqlEntityManager.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import type { AnyEntity, ConnectionType, EntityData, EntityName, EntityRepository, GetRepository, QueryResult } from '@mikro-orm/core';
+import type { AnyEntity, ConnectionType, EntityData, EntityName, EntityRepository, GetRepository, QueryResult, FilterQuery } from '@mikro-orm/core';
 import { EntityManager } from '@mikro-orm/core';
 import type { AbstractSqlDriver } from './AbstractSqlDriver';
 import { QueryBuilder } from './query';
@@ -22,4 +22,5 @@ export declare class SqlEntityManager<D extends AbstractSqlDriver = AbstractSqlD
     getKnex(type?: ConnectionType): Knex<any, any[]>;
     execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(queryOrKnex: string | Knex.QueryBuilder | Knex.Raw, params?: any[], method?: 'all' | 'get' | 'run'): Promise<T>;
     getRepository<T extends object, U extends EntityRepository<T> = SqlEntityRepository<T>>(entityName: EntityName<T>): GetRepository<T, U>;
+    protected applyDiscriminatorCondition<Entity extends object>(entityName: string, where: FilterQuery<Entity>): FilterQuery<Entity>;
 }

package/SqlEntityManager.js

@@ -32,5 +32,9 @@ class SqlEntityManager extends core_1.EntityManager {
     getRepository(entityName) {
         return super.getRepository(entityName);
     }
+    applyDiscriminatorCondition(entityName, where) {
+        // this is handled in QueryBuilder now for SQL drivers
+        return where;
+    }
 }
 exports.SqlEntityManager = SqlEntityManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.69",
+  "version": "6.0.0-dev.70",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^5.7.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.69"
+    "@mikro-orm/core": "~6.0.0-dev.70"
   }
 }

package/query/QueryBuilder.d.ts

@@ -206,6 +206,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     private prepareFields;
     private init;
     private getQueryBase;
+    private applyDiscriminatorCondition;
     private finalize;
     private processPopulateWhere;
     private hasToManyJoins;

package/query/QueryBuilder.js

@@ -792,6 +792,24 @@ class QueryBuilder {
         }
         return qb;
     }
+    applyDiscriminatorCondition() {
+        const meta = this.mainAlias.metadata;
+        if (!meta?.discriminatorValue) {
+            return;
+        }
+        const types = Object.values(meta.root.discriminatorMap).map(cls => this.metadata.find(cls));
+        const children = [];
+        const lookUpChildren = (ret, type) => {
+            const children = types.filter(meta2 => meta2.extends === type);
+            children.forEach(m => lookUpChildren(ret, m.className));
+            ret.push(...children.filter(c => c.discriminatorValue));
+            return children;
+        };
+        lookUpChildren(children, meta.className);
+        this.andWhere({
+            [meta.root.discriminatorColumn]: children.length > 0 ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] } : meta.discriminatorValue,
+        });
+    }
     finalize() {
         if (this.finalized) {
             return;
@@ -800,6 +818,7 @@ class QueryBuilder {
             this.select('*');
         }
         const meta = this.mainAlias.metadata;
+        this.applyDiscriminatorCondition();
         if (meta && this.flags.has(core_1.QueryFlag.AUTO_JOIN_ONE_TO_ONE_OWNER)) {
             const relationsToPopulate = this._populate.map(({ field }) => field);
             meta.relations
@@ -965,8 +984,8 @@ class QueryBuilder {
         const prop = this._cond[pivotMeta.name + '.' + owner.name] || this._orderBy[pivotMeta.name + '.' + owner.name] ? inverse : owner;
         const pivotAlias = this.getNextAlias(pivotMeta.name);
         this._joins[field] = this.helper.joinPivotTable(field, prop, this.mainAlias.aliasName, pivotAlias, 'leftJoin');
-        core_1.Utils.renameKey(this._cond, `${field}.${owner.name}`, core_1.Utils.getPrimaryKeyHash(owner.fieldNames.map(fieldName => `${pivotAlias}.${fieldName}`)));
-        core_1.Utils.renameKey(this._cond, `${field}.${inverse.name}`, core_1.Utils.getPrimaryKeyHash(inverse.fieldNames.map(fieldName => `${pivotAlias}.${fieldName}`)));
+        core_1.Utils.renameKey(this._cond, `${field}.${owner.name}`, core_1.Utils.getPrimaryKeyHash(owner.fieldNames.map(fieldName => `${pivotAlias}.${fieldName}`)), true);
+        core_1.Utils.renameKey(this._cond, `${field}.${inverse.name}`, core_1.Utils.getPrimaryKeyHash(inverse.fieldNames.map(fieldName => `${pivotAlias}.${fieldName}`)), true);
         this._populateMap[field] = this._joins[field].alias;
     }
     getSchema(alias) {

package/query/QueryBuilderHelper.js

@@ -177,6 +177,11 @@ class QueryBuilderHelper {
                 const right = `${join.alias}.${join.joinColumns[idx]}`;
                 conditions.push(`${this.knex.ref(left)} = ${this.knex.ref(right)}`);
             });
+            if (join.prop.targetMeta.discriminatorValue && !join.path?.endsWith('[pivot]')) {
+                const typeProperty = join.prop.targetMeta.root.discriminatorColumn;
+                const alias = !join.prop.owner ? join.inverseAlias ?? join.alias : join.ownerAlias;
+                join.cond[`${alias}.${typeProperty}`] = join.prop.targetMeta.discriminatorValue;
+            }
             Object.keys(join.cond).forEach(key => {
                 conditions.push(this.processJoinClause(key, join.cond[key], params));
             });