@mikro-orm/sql 7.0.3-dev.2 → 7.0.3-dev.20

package/AbstractSqlDriver.d.ts

@@ -1,4 +1,4 @@
-import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type FormulaTable, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type ObjectQuery, type Options, type OrderDefinition, type PopulateOptions, type PopulatePath, type Primary, type QueryOrderMap, type QueryResult, type Raw, RawQueryFragment, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
+import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type FormulaTable, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type ObjectQuery, type Options, type OrderDefinition, type PopulateOptions, type Primary, type QueryOrderMap, type QueryResult, type Raw, RawQueryFragment, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from './AbstractSqlConnection.js';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform.js';
 import { type AnyQueryBuilder } from './query/QueryBuilder.js';
@@ -23,8 +23,8 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     private validateSqlOptions;
     createEntityManager(useContext?: boolean): this[typeof EntityManagerType];
     private createQueryBuilderFromOptions;
-    find<T extends object, P extends string = never, F extends string = PopulatePath.ALL, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOptions<T, P, F, E>): Promise<EntityData<T>[]>;
-    findOne<T extends object, P extends string = never, F extends string = PopulatePath.ALL, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOneOptions<T, P, F, E>): Promise<EntityData<T> | null>;
+    find<T extends object, P extends string = never, F extends string = never, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOptions<T, P, F, E>): Promise<EntityData<T>[]>;
+    findOne<T extends object, P extends string = never, F extends string = never, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOneOptions<T, P, F, E>): Promise<EntityData<T> | null>;
     protected hasToManyJoins<T extends object>(hint: PopulateOptions<T>, meta: EntityMetadata<T>): boolean;
     findVirtual<T extends object>(entityName: EntityName<T>, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>): Promise<EntityData<T>[]>;
     countVirtual<T extends object>(entityName: EntityName<T>, where: ObjectQuery<T>, options: CountOptions<T, any>): Promise<number>;

package/AbstractSqlDriver.js

@@ -845,7 +845,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     value = this.mapDataToFieldNames(value, false, prop.embeddedProps, options.convertCustomTypes);
                 }
             }
-            params.push(value);
+            params.push(value ?? null);
         };
         for (const key of keys) {
             const prop = meta.properties[key] ?? meta.root.properties[key];
@@ -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/README.md

@@ -64,7 +64,7 @@ export class Book extends BookSchema.class {}
 BookSchema.setClass(Book);
 ```
 
-You can also define entities using [decorators](https://mikro-orm.io/docs/defining-entities) or [`EntitySchema`](https://mikro-orm.io/docs/entity-schema). See the [defining entities guide](https://mikro-orm.io/docs/defining-entities) for all options.
+You can also define entities using [decorators](https://mikro-orm.io/docs/using-decorators) or [`EntitySchema`](https://mikro-orm.io/docs/define-entity#entityschema-low-level-api). See the [defining entities guide](https://mikro-orm.io/docs/defining-entities) for all options.
 
 ### Initialize and Use
 

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -311,10 +311,32 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                         : undefined,
                 comment: col.column_comment,
             };
-            if (nativeEnums?.[column.type]) {
+            let enumKey = column.type;
+            let enumEntry = nativeEnums?.[enumKey];
+            // for array enum columns, strip the [] suffix and try the base type,
+            // try schema-qualified key first for non-default schemas to avoid
+            // ambiguity when multiple schemas have enums with the same name
+            if (!enumEntry && enumKey.endsWith('[]')) {
+                const baseType = enumKey.slice(0, -2);
+                if (col.udt_schema && col.udt_schema !== this.platform.getDefaultSchemaName()) {
+                    const schemaKey = `${col.udt_schema}.${baseType}`;
+                    enumEntry = nativeEnums?.[schemaKey];
+                    if (enumEntry) {
+                        enumKey = schemaKey;
+                        column.type = `${schemaKey}[]`;
+                    }
+                }
+                if (!enumEntry) {
+                    enumEntry = nativeEnums?.[baseType];
+                    if (enumEntry) {
+                        enumKey = baseType;
+                    }
+                }
+            }
+            if (enumEntry) {
                 column.mappedType = Type.getType(EnumType);
-                column.nativeEnumName = column.type;
-                column.enumItems = nativeEnums[column.type]?.items;
+                column.nativeEnumName = enumKey;
+                column.enumItems = enumEntry.items;
             }
             ret[key].push(column);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.3-dev.2",
+  "version": "7.0.3-dev.20",
   "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.2"
+    "@mikro-orm/core": "7.0.3-dev.20"
   },
   "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 } },
+                            ],
+                        });
+                    }
+                }
             }
         }
     }