@mikro-orm/sql 7.2.0-dev.0 → 7.2.0-dev.10

package/AbstractSqlConnection.d.ts

@@ -36,6 +36,13 @@ export declare abstract class AbstractSqlConnection extends Connection {
     getClient<T = any>(): Kysely<T>;
     /** Ensures the Kysely client is initialized, creating it asynchronously if needed. */
     initClient(): Promise<void>;
+    /**
+     * Guards `getNativeClient()` overrides — drivers only capture their client while building their
+     * own dialect, which `driverOptions` carrying a ready-made Kysely instance or dialect skips.
+     *
+     * @internal
+     */
+    protected requireNativeClient<T>(client: T | undefined | null): T;
     /** Executes a callback within a transaction, committing on success and rolling back on error. */
     transactional<T>(cb: (trx: Transaction<ControlledTransaction<any, any>>) => Promise<T>, options?: {
         isolationLevel?: IsolationLevel;
@@ -56,11 +63,20 @@ export declare abstract class AbstractSqlConnection extends Connection {
     commit(ctx: ControlledTransaction<any, any>, eventBroadcaster?: TransactionEventBroadcaster, loggerContext?: LogContext): Promise<void>;
     /** Rolls back the transaction or rolls back to the savepoint. */
     rollback(ctx: ControlledTransaction<any, any>, eventBroadcaster?: TransactionEventBroadcaster, loggerContext?: LogContext): Promise<void>;
+    /**
+     * Waits until the transaction's connection has no query in flight. Kysely runs `rollback` straight
+     * on that connection instead of going through its connection provider, so a rollback caused by an
+     * aborted query would otherwise be sent while the aborted query is still running. That not only
+     * queues the rollback behind it on the server, it also overwrites the query id Kysely compares
+     * against before firing the `'cancel query'`/`'kill session'` control statement — the control
+     * statement is then discarded as stale and the abort never reaches the database.
+     */
+    private waitForIdleTransaction;
     private prepareQuery;
     /** Executes a SQL query and returns the result based on the method: `'all'` for rows, `'get'` for single row, `'run'` for affected count. */
-    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: readonly unknown[], method?: 'all' | 'get' | 'run', ctx?: Transaction, loggerContext?: LoggingOptions): Promise<T>;
+    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: readonly unknown[] | Dictionary<unknown>, method?: 'all' | 'get' | 'run', ctx?: Transaction, loggerContext?: LoggingOptions): Promise<T>;
     /** Executes a SQL query and returns an async iterable that yields results row by row. */
-    stream<T extends EntityData<AnyEntity>>(query: string | NativeQueryBuilder | RawQueryFragment, params?: readonly unknown[], ctx?: Transaction<Kysely<any>>, loggerContext?: LoggingOptions, chunkSize?: number): AsyncIterableIterator<T>;
+    stream<T extends EntityData<AnyEntity>>(query: string | NativeQueryBuilder | RawQueryFragment, params?: readonly unknown[] | Dictionary<unknown>, ctx?: Transaction<Kysely<any>>, loggerContext?: LoggingOptions, chunkSize?: number): AsyncIterableIterator<T>;
     /** @inheritDoc */
     executeDump(dump: string): Promise<void>;
     protected getSql(query: string, formatted: string, context?: LogContext): string;

package/AbstractSqlConnection.js

@@ -1,5 +1,5 @@
 import { CompiledQuery, Kysely } from 'kysely';
-import { Connection, EventType, isRaw, Utils, } from '@mikro-orm/core';
+import { Connection, EventType, isRaw, raw, Utils, } from '@mikro-orm/core';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 /**
  * Pulls cancellation controls out of a `loggerContext` payload, returning the abort options
@@ -101,6 +101,18 @@ export class AbstractSqlConnection extends Connection {
             await this.createKysely();
         }
     }
+    /**
+     * Guards `getNativeClient()` overrides — drivers only capture their client while building their
+     * own dialect, which `driverOptions` carrying a ready-made Kysely instance or dialect skips.
+     *
+     * @internal
+     */
+    requireNativeClient(client) {
+        if (client == null) {
+            throw new Error('The native client is not available, as it is owned by the Kysely instance or dialect passed via `driverOptions`. Access it through the object you provided there instead.');
+        }
+        return client;
+    }
     /** Executes a callback within a transaction, committing on success and rolling back on error. */
     async transactional(cb, options = {}) {
         const trx = await this.begin(options);
@@ -110,7 +122,15 @@ export class AbstractSqlConnection extends Connection {
             return ret;
         }
         catch (error) {
-            await this.rollback(trx, options.eventBroadcaster, options.loggerContext);
+            // A failing rollback must not mask why the transaction failed in the first place — the
+            // `'kill session'` abort strategy tears the connection down, so the rollback that follows can
+            // only ever report the dead connection.
+            try {
+                await this.rollback(trx, options.eventBroadcaster, options.loggerContext);
+            }
+            catch (rollbackError) {
+                this.logger.warn('query', `Failed to roll back transaction: ${rollbackError.message}`);
+            }
             throw error;
         }
     }
@@ -138,18 +158,8 @@ export class AbstractSqlConnection extends Connection {
             trxBuilder = trxBuilder.setAccessMode('read only');
         }
         const trx = await trxBuilder.execute();
-        if (options.ctx) {
-            const ctx = options.ctx;
-            ctx.index ??= 0;
-            const savepointName = `trx${ctx.index + 1}`;
-            Reflect.defineProperty(trx, 'index', { value: ctx.index + 1 });
-            Reflect.defineProperty(trx, 'savepointName', { value: savepointName });
-            this.logQuery(this.platform.getSavepointSQL(savepointName), options.loggerContext);
-        }
-        else {
-            for (const query of this.platform.getBeginTransactionSQL(options)) {
-                this.logQuery(query, options.loggerContext);
-            }
+        for (const query of this.platform.getBeginTransactionSQL(options)) {
+            this.logQuery(query, options.loggerContext);
         }
         await options.eventBroadcaster?.dispatchEvent(EventType.afterTransactionStart, trx);
         return trx;
@@ -173,6 +183,7 @@ export class AbstractSqlConnection extends Connection {
     /** Rolls back the transaction or rolls back to the savepoint. */
     async rollback(ctx, eventBroadcaster, loggerContext) {
         await eventBroadcaster?.dispatchEvent(EventType.beforeTransactionRollback, ctx);
+        await this.waitForIdleTransaction(ctx);
         if ('savepointName' in ctx) {
             await ctx.rollbackToSavepoint(ctx.savepointName).execute();
             this.logQuery(this.platform.getRollbackToSavepointSQL(ctx.savepointName), loggerContext);
@@ -183,17 +194,32 @@ export class AbstractSqlConnection extends Connection {
         }
         await eventBroadcaster?.dispatchEvent(EventType.afterTransactionRollback, ctx);
     }
+    /**
+     * Waits until the transaction's connection has no query in flight. Kysely runs `rollback` straight
+     * on that connection instead of going through its connection provider, so a rollback caused by an
+     * aborted query would otherwise be sent while the aborted query is still running. That not only
+     * queues the rollback behind it on the server, it also overwrites the query id Kysely compares
+     * against before firing the `'cancel query'`/`'kill session'` control statement — the control
+     * statement is then discarded as stale and the abort never reaches the database.
+     */
+    async waitForIdleTransaction(ctx) {
+        await ctx.getExecutor().provideConnection(async () => undefined);
+    }
     prepareQuery(query, params = []) {
         if (query instanceof NativeQueryBuilder) {
             query = query.toRaw();
         }
+        if (typeof query === 'string' && !Array.isArray(params)) {
+            // plain object params hold named parameters, translate them via the `raw()` helper
+            query = raw(query, params);
+        }
         if (isRaw(query)) {
             params = query.params;
             query = query.sql;
         }
         query = this.config.get('onQuery')(query, params);
         const formatted = this.platform.formatQuery(query, params);
-        return { query, params, formatted };
+        return { query, params: params, formatted };
     }
     /** Executes a SQL query and returns the result based on the method: `'all'` for rows, `'get'` for single row, `'run'` for affected count. */
     async execute(query, params = [], method = 'all', ctx, loggerContext) {
@@ -227,7 +253,7 @@ export class AbstractSqlConnection extends Connection {
                 .stream(compiled, chunkSize ?? 100, abort ? { signal: abort.signal } : undefined);
             this.logQuery(sql, {
                 sql,
-                params,
+                params: q.params,
                 ...cleanCtx,
                 affected: Utils.isPlainObject(res) ? res.affectedRows : undefined,
             });
@@ -238,7 +264,7 @@ export class AbstractSqlConnection extends Connection {
             }
         }
         catch (e) {
-            this.logQuery(sql, { sql, params, ...cleanCtx, level: 'error' });
+            this.logQuery(sql, { sql, params: q.params, ...cleanCtx, level: 'error' });
             throw e;
         }
     }

package/AbstractSqlDriver.d.ts

@@ -100,7 +100,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
      */
     private convertOwnerPksForPivotQuery;
     private getPivotOrderBy;
-    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: any[], method?: 'all' | 'get' | 'run', ctx?: Transaction, loggerContext?: LoggingOptions): Promise<T>;
+    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: any[] | Dictionary, method?: 'all' | 'get' | 'run', ctx?: Transaction, loggerContext?: LoggingOptions): Promise<T>;
     stream<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>, options: StreamOptions<T, any, any, any>): AsyncIterableIterator<T>;
     /**
      * 1:1 owner side needs to be marked for population so QB auto-joins the owner id
@@ -168,7 +168,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected extractManyToMany<T>(meta: EntityMetadata<T>, data: EntityDictionary<T>): EntityData<T>;
     protected processManyToMany<T extends object>(meta: EntityMetadata<T>, pks: Primary<T>[], collections: EntityData<T>, clear: boolean, options?: DriverMethodOptions): Promise<void>;
     lockPessimistic<T extends object>(entity: T, options: LockOptions): Promise<void>;
-    protected buildPopulateWhere<T extends object>(meta: EntityMetadata<T>, joinedProps: PopulateOptions<T>[], options: Pick<FindOptions<any>, 'populateWhere'>): ObjectQuery<T>;
+    protected buildPopulateWhere<T extends object>(meta: EntityMetadata<T>, joinedProps: PopulateOptions<T>[], options: Pick<FindOptions<any>, 'populateWhere' | 'strategy'>): ObjectQuery<T>;
     /**
      * Builds a UNION ALL (or UNION) subquery from `unionWhere` branches and merges it
      * into the main WHERE as `pk IN (branch_1 UNION ALL branch_2 ...)`.

package/AbstractSqlDriver.js

@@ -604,7 +604,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         let pk;
         if (meta.primaryKeys.length > 1) {
             // owner has composite pk
-            pk = Utils.getPrimaryKeyCond(data, meta.primaryKeys);
+            pk = Utils.getOrderedPrimaryKeys(data, meta);
         }
         else {
             /* v8 ignore next */
@@ -887,10 +887,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const res = await this.execute(sql, params, 'run', options.ctx, withAbortContext(options.loggerContext, options));
         let pk;
-        /* v8 ignore next */
         if (pks.length > 1) {
             // owner has composite pk
-            pk = data.map(d => Utils.getPrimaryKeyCond(d, pks));
+            pk = data.map(d => Utils.getOrderedPrimaryKeys(d, meta));
         }
         else {
             res.row ??= {};
@@ -949,8 +948,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             }
             res = await this.rethrow(qb.execute('run', false));
         }
-        /* v8 ignore next */
-        const pk = pks.map(pk => Utils.extractPK(data[pk] || where, meta));
+        const pk = Utils.getOrderedPrimaryKeys({ ...where, ...data }, meta);
         await this.processManyToMany(meta, pk, collections, true, options);
         return res;
     }
@@ -1072,7 +1070,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
             ? `(${pks.map(() => '?').join(', ')})`
             : `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)} = ?`).join(' and ')})`;
         const conds = where.map(cond => {
-            if (Utils.isPlainObject(cond) && Utils.getObjectKeysSize(cond) === 1) {
+            // with multiple PK columns the condition is looked up by property name, so it needs to stay an object
+            if (pks.length === 1 && Utils.isPlainObject(cond) && Utils.getObjectKeysSize(cond) === 1) {
                 cond = Object.values(cond)[0];
             }
             if (pks.length > 1) {
@@ -1100,7 +1099,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             sql += conds.join(' or ');
         }
         if (this.platform.usesReturningStatement() && returning.size > 0) {
-            const returningFields = Utils.flatten([...returning].map(prop => meta.properties[prop].fieldNames));
+            const returningFields = Utils.flatten([...returning].map(prop => (meta.properties[prop] ?? meta.root.properties[prop]).fieldNames));
             /* v8 ignore next */
             sql +=
                 returningFields.length > 0
@@ -1112,7 +1111,8 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const res = await this.rethrow(this.execute(sql, params, 'run', options.ctx, withAbortContext(options.loggerContext, options)));
         for (let i = 0; i < collections.length; i++) {
-            await this.processManyToMany(meta, where[i], collections[i], false, options);
+            const pk = Utils.getOrderedPrimaryKeys(where[i], meta);
+            await this.processManyToMany(meta, pk, collections[i], false, options);
         }
         return res;
     }
@@ -1316,7 +1316,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 }
             }
         }
-        return this.buildPivotResultMap(owners, res, pivotProp2.name, pivotProp1.name);
+        return this.buildPivotResultMap(owners, res, pivotProp2.name, pivotProp1.name, ownerMeta);
     }
     /**
      * Load from a polymorphic M:N pivot table.
@@ -1337,10 +1337,15 @@ export class AbstractSqlDriver extends DatabaseDriver {
     async loadPolymorphicPivotOwnerSide(prop, owners, where, orderBy, ctx, options, pivotJoin, inverseProp) {
         const pivotMeta = this.metadata.get(prop.pivotEntity);
         const targetMeta = prop.targetMeta;
-        // Build condition: discriminator = 'post' AND {discriminator} IN (...)
+        // `prop.discriminator` spans all owner FK columns but carries no target metadata, so a composite
+        // owner PK neither expands to a tuple condition nor gets mapped back; the virtual M:1 relation
+        // to this discriminator's owner describes the same columns as an actual relation
+        const ownerMeta = this.metadata.get(pivotMeta.polymorphicDiscriminatorMap[prop.discriminatorValue]);
+        const ownerProp = pivotMeta.properties[`${prop.discriminator}_${ownerMeta.tableName}`];
+        // Build condition: discriminator = 'post' AND {owner} IN (...)
         const cond = {
             [prop.discriminatorColumn]: prop.discriminatorValue,
-            [prop.discriminator]: { $in: owners.length === 1 && owners[0].length === 1 ? owners.map(o => o[0]) : owners },
+            [ownerProp.name]: { $in: owners.length === 1 && owners[0].length === 1 ? owners.map(o => o[0]) : owners },
         };
         if (!Utils.isEmpty(where)) {
             cond[inverseProp.name] = { ...where };
@@ -1351,9 +1356,13 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const childExclude = !Utils.isEmpty(options?.exclude)
             ? options.exclude.map(f => `${inverseProp.name}.${f}`)
             : [];
+        // the owner relation is virtual, so its FK columns have to be selected via the pivot props that
+        // cover them; only the first owner of a shared pivot gets the flat prop named after the
+        // discriminator, and it keeps that owner's columns, so later owners get per-column props instead
+        const ownerFields = Utils.unique(prop.joinColumns.map(col => (pivotMeta.properties[col] ? col : prop.discriminator)));
         const fields = pivotJoin
-            ? [inverseProp.name, prop.discriminator, prop.discriminatorColumn]
-            : [inverseProp.name, prop.discriminator, prop.discriminatorColumn, ...childFields];
+            ? [inverseProp.name, ...ownerFields, prop.discriminatorColumn]
+            : [inverseProp.name, ...ownerFields, prop.discriminatorColumn, ...childFields];
         const res = await this.find(pivotMeta.class, cond, {
             ctx,
             ...options,
@@ -1374,7 +1383,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             _populateWhere: 'infer',
             populateFilter: this.wrapPopulateFilter(options, inverseProp.name),
         });
-        return this.buildPivotResultMap(owners, res, prop.discriminator, inverseProp.name);
+        return this.buildPivotResultMap(owners, res, ownerProp.name, inverseProp.name, ownerMeta);
     }
     /**
      * Load from inverse side of polymorphic M:N (e.g., Tag -> Posts)
@@ -1423,7 +1432,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             _populateWhere: 'infer',
             populateFilter: this.wrapPopulateFilter(options, ownerRelationName),
         });
-        return this.buildPivotResultMap(owners, res, tagProp.name, ownerRelationName);
+        return this.buildPivotResultMap(owners, res, tagProp.name, ownerRelationName, tagProp.targetMeta);
     }
     /**
      * Load a union-target polymorphic M:N pivot (e.g. Post.attachments -> Image | Video).
@@ -1519,19 +1528,23 @@ export class AbstractSqlDriver extends DatabaseDriver {
             }
         }
         const result = orphanedRows.size > 0 ? pivotRows.filter(r => !orphanedRows.has(r)) : pivotRows;
-        return this.buildPivotResultMap(owners, result, ownerProp.name, prop.discriminator);
+        return this.buildPivotResultMap(owners, result, ownerProp.name, prop.discriminator, ownerMeta);
     }
     /**
      * Build a map from owner PKs to their related entities from pivot table results.
      */
-    buildPivotResultMap(owners, results, keyProp, valueProp) {
+    buildPivotResultMap(owners, results, keyProp, valueProp, ownerMeta) {
         const map = {};
         for (const owner of owners) {
             const key = Utils.getPrimaryKeyHash(owner);
             map[key] = [];
         }
         for (const item of results) {
-            const key = Utils.getPrimaryKeyHash(Utils.asArray(item[keyProp]));
+            const fk = item[keyProp];
+            // the owner PKs are always flat, while the pivot FK follows the owner PK structure,
+            // so a PK built from a relation to another composite PK entity needs flattening too
+            const pks = ownerMeta && fk != null ? Utils.getOrderedPrimaryKeys(fk, ownerMeta) : Utils.asArray(fk);
+            const key = Utils.getPrimaryKeyHash(pks);
             const entity = item[valueProp];
             if (map[key]) {
                 map[key].push(entity);
@@ -1657,8 +1670,23 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const [propName, ref] = hint.field.split(':', 2);
             return { propName, ref, children: hint.children };
         });
+        // with `fixedOrder` the pivot PK is the order column, which is not guaranteed to be unique when the
+        // pivot table is managed externally, so we disambiguate the rows by their FKs on top of the PK
+        // (including virtual ones, as the owner FK of a polymorphic pivot is only mapped via non-persisted relations)
+        const pivotRelations = meta.pivotTable && !meta.compositePK ? meta.relations.filter(p => p.kind === ReferenceKind.MANY_TO_ONE) : [];
         for (const item of rawResults) {
-            const pk = Utils.getCompositeKeyHash(item, meta);
+            // flat hash, so nested composite PK values keep their own separators and cannot collide
+            let pk = Utils.getCompositeKeyHash(item, meta, false, undefined, true);
+            if (pivotRelations.length > 0) {
+                pk = Utils.getPrimaryKeyHash([
+                    pk,
+                    ...pivotRelations.flatMap(p => {
+                        const value = item[p.name];
+                        // composite FKs are mapped to an array of values, which `extractPK` does not accept
+                        return (Array.isArray(value) ? Utils.flatten(value, true) : Utils.extractPK(value, p.targetMeta));
+                    }),
+                ]);
+            }
             if (map[pk]) {
                 for (const { propName } of hints) {
                     if (!item[propName]) {
@@ -2087,7 +2115,20 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const ret = {};
         for (const prop of meta.relations) {
             if (prop.kind === ReferenceKind.MANY_TO_MANY && data[prop.name]) {
-                ret[prop.name] = data[prop.name].map((item) => Utils.asArray(item));
+                // union targets are validated to have a single PK column, so a pivot row is always keyed
+                // by exactly `[discriminator, pk]` - anything else cannot address a target table
+                const discriminators = QueryHelper.isUnionTargetPolymorphic(prop)
+                    ? Object.keys(prop.discriminatorMap)
+                    : undefined;
+                ret[prop.name] = data[prop.name].map((item) => {
+                    const values = Utils.asArray(item);
+                    if (discriminators && !(values.length === 2 && discriminators.includes('' + values[0]))) {
+                        throw new Error(`Cannot resolve the discriminator value of ${meta.className}.${prop.name} from '${values.join(', ')}', ` +
+                            `as the same primary key can exist in any of the target tables. ` +
+                            `Pass the target as a [discriminator, ...primaryKey] tuple, e.g. ${JSON.stringify([discriminators[0], ...values])}.`);
+                    }
+                    return values;
+                });
                 delete data[prop.name];
             }
         }
@@ -2124,7 +2165,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
             if (hint.children) {
                 const targetMeta = prop.targetMeta;
                 if (targetMeta) {
-                    const inner = this.buildPopulateWhere(targetMeta, hint.children, {});
+                    // only joined children contribute to the ON conditions, the rest is handled by the entity loader
+                    const children = this.joinedProps(targetMeta, hint.children, options);
+                    const inner = this.buildPopulateWhere(targetMeta, children, { strategy: options.strategy });
                     if (!Utils.isEmpty(inner) || RawQueryFragment.hasObjectFragments(inner)) {
                         where[prop.name] ??= {};
                         Object.assign(where[prop.name], inner);

package/AbstractSqlPlatform.d.ts

@@ -6,6 +6,7 @@ import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 /** Base class for SQL database platforms, providing SQL generation and quoting utilities. */
 export declare abstract class AbstractSqlPlatform extends Platform {
     #private;
+    private static readonly ORDER_BY_DIRECTIONS;
     protected readonly schemaHelper?: SchemaHelper;
     usesPivotTable(): boolean;
     indexForeignKeys(): boolean;
@@ -46,6 +47,12 @@ export declare abstract class AbstractSqlPlatform extends Platform {
      * @internal
      */
     getOrderByExpression(column: string, direction: string, collation?: string): string[];
+    /**
+     * `toLowerCase()` folds every `QueryOrder` enum member (and the normalized `QueryOrderNumeric`
+     * values) onto the six allow-listed directions, so only unknown values are rejected.
+     * @internal
+     */
+    validateOrderByDirection(direction: string): string;
     /**
      * Quotes a collation name for use in COLLATE clauses.
      * @internal

package/AbstractSqlPlatform.js

@@ -5,6 +5,14 @@ import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 /** Base class for SQL database platforms, providing SQL generation and quoting utilities. */
 export class AbstractSqlPlatform extends Platform {
     static #JSON_PROPERTY_NAME_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+    static ORDER_BY_DIRECTIONS = new Set([
+        'asc',
+        'desc',
+        'asc nulls first',
+        'asc nulls last',
+        'desc nulls first',
+        'desc nulls last',
+    ]);
     schemaHelper;
     usesPivotTable() {
         return true;
@@ -115,10 +123,23 @@ export class AbstractSqlPlatform extends Platform {
      * @internal
      */
     getOrderByExpression(column, direction, collation) {
+        const dir = this.validateOrderByDirection(direction);
         if (collation) {
-            return [`${column} collate ${this.quoteCollation(collation)} ${direction.toLowerCase()}`];
+            return [`${column} collate ${this.quoteCollation(collation)} ${dir}`];
         }
-        return [`${column} ${direction.toLowerCase()}`];
+        return [`${column} ${dir}`];
+    }
+    /**
+     * `toLowerCase()` folds every `QueryOrder` enum member (and the normalized `QueryOrderNumeric`
+     * values) onto the six allow-listed directions, so only unknown values are rejected.
+     * @internal
+     */
+    validateOrderByDirection(direction) {
+        const dir = ('' + direction).toLowerCase().trim();
+        if (!AbstractSqlPlatform.ORDER_BY_DIRECTIONS.has(dir)) {
+            throw new Error(`Invalid order direction: '${direction}'`);
+        }
+        return dir;
     }
     /**
      * Quotes a collation name for use in COLLATE clauses.

package/SqlEntityManager.d.ts

@@ -60,14 +60,14 @@ export declare class SqlEntityManager<Driver extends AbstractSqlDriver = Abstrac
      * `signal` / `inflightQueryAbortStrategy` (set via `em.fork({ signal })`) is applied automatically.
      * For per-call cancellation use the options-bag overload below.
      */
-    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: any[], method?: 'all' | 'get' | 'run', loggerContext?: LoggingOptions): Promise<T>;
+    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params?: any[] | Dictionary, method?: 'all' | 'get' | 'run', loggerContext?: LoggingOptions): Promise<T>;
     /**
      * Executes a raw SQL query with an options bag carrying `method`, `loggerContext`, `signal`
      * and `inflightQueryAbortStrategy`. Per-call `signal` / `inflightQueryAbortStrategy` override
      * the fork-level defaults set via `em.fork({ signal })`. The current transaction context is
      * applied automatically.
      */
-    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params: any[], options: EmExecuteOptions): Promise<T>;
+    execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(query: string | NativeQueryBuilder | RawQueryFragment, params: any[] | Dictionary, options: EmExecuteOptions): Promise<T>;
     /**
      * @inheritDoc
      */

package/SqlEntityManager.js

@@ -75,8 +75,7 @@ export class SqlEntityManager extends EntityManager {
      */
     async countBy(entityName, groupBy, options = {}) {
         const em = this.getContext(false);
-        options = { ...options };
-        em.prepareOptions(options);
+        options = em.prepareOptions(options);
         const meta = em.getMetadata().find(entityName);
         const fields = Utils.asArray(groupBy);
         const { where: rawWhere, ...countOptions } = options;

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -168,7 +168,7 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             const fields = this.options.groupBy.map(field => this.quote(field));
             this.parts.push(`group by ${fields.join(', ')}`);
         }
-        if (this.options.having) {
+        if (this.options.having?.sql.trim()) {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }

package/dialects/mysql/BaseMySqlPlatform.js

@@ -114,7 +114,7 @@ export class BaseMySqlPlatform extends AbstractSqlPlatform {
     }
     getOrderByExpression(column, direction, collation) {
         const ret = [];
-        const dir = direction.toLowerCase();
+        const dir = this.validateOrderByDirection(direction);
         const col = collation ? `${column} collate ${this.quoteCollation(collation)}` : column;
         if (dir in this.ORDER_BY_NULLS_TRANSLATE) {
             ret.push(`${col} ${this.ORDER_BY_NULLS_TRANSLATE[dir]}`);

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -53,6 +53,7 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string[];
     getRenameColumnSQL(tableName: string, oldColumnName: string, to: Column): string;
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string[];
+    protected hasInlineColumnComment(): boolean;
     getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
     alterTableColumn(column: Column, table: DatabaseTable, changedProperties: Set<string>): string[];
     private getColumnDeclarationSQL;

package/dialects/mysql/MySqlSchemaHelper.js

@@ -54,10 +54,10 @@ export class MySqlSchemaHelper extends SchemaHelper {
         return sql;
     }
     getListTablesSQL() {
-        return `select table_name as table_name, nullif(table_schema, schema()) as schema_name, table_comment as table_comment, table_collation as table_collation from information_schema.tables where table_type = 'BASE TABLE' and table_schema = schema()`;
+        return `select table_name as table_name, nullif(table_schema, schema()) as schema_name, table_comment as table_comment, table_collation as table_collation from information_schema.tables where table_type = 'BASE TABLE' and table_schema = schema() order by table_name`;
     }
     getListViewsSQL() {
-        return `select table_name as view_name, nullif(table_schema, schema()) as schema_name, view_definition from information_schema.views where table_schema = schema()`;
+        return `select table_name as view_name, nullif(table_schema, schema()) as schema_name, view_definition from information_schema.views where table_schema = schema() order by table_name`;
     }
     async loadViews(schema, connection, schemaName, ctx) {
         const views = await connection.execute(this.getListViewsSQL(), [], 'all', ctx);
@@ -322,7 +322,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
         const ret = [];
         for (const event of trigger.events) {
             const name = trigger.events.length > 1 ? `${trigger.name}_${event}` : trigger.name;
-            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ROW begin ${trigger.body}; end`);
+            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ROW begin ${this.normalizeTriggerBody(trigger.body)} end`);
         }
         return ret.join(';\n');
     }
@@ -372,6 +372,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
       from information_schema.routines r
       where r.routine_schema = database()
         and r.routine_type in ('PROCEDURE', 'FUNCTION')
+      order by r.routine_name
     `;
         const [rows, params] = await Promise.all([
             connection.execute(sql),
@@ -539,6 +540,9 @@ export class MySqlSchemaHelper extends SchemaHelper {
         const keyName = this.quote(index.keyName);
         return [`alter table ${tableName} rename index ${oldIndexName} to ${keyName}`];
     }
+    hasInlineColumnComment() {
+        return true;
+    }
     getChangeColumnCommentSQL(tableName, to, schemaName) {
         tableName = this.quote(tableName);
         const columnName = this.quote(to.name);

package/dialects/oracledb/OracleNativeQueryBuilder.js

@@ -234,7 +234,7 @@ export class OracleNativeQueryBuilder extends NativeQueryBuilder {
             const fields = this.options.groupBy.map(field => this.quote(field));
             this.parts.push(`group by ${fields.join(', ')}`);
         }
-        if (this.options.having) {
+        if (this.options.having?.sql.trim()) {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }

package/dialects/postgresql/PostgreSqlSchemaHelper.d.ts

@@ -69,6 +69,8 @@ export declare class PostgreSqlSchemaHelper extends SchemaHelper {
     createTrigger(table: DatabaseTable, trigger: SqlTriggerDef): string;
     /** Generates SQL to drop a PostgreSQL trigger and its associated function. */
     dropTrigger(table: DatabaseTable, trigger: SqlTriggerDef): string;
+    /** Flattens `;\n` inside the dollar-quoted blocks of a raw DDL expression, which are not statement boundaries. */
+    private flattenDollarQuotedBodies;
     createRoutine(routine: SqlRoutineDef): string;
     dropRoutine(routine: SqlRoutineDef): string;
     getAllRoutines(connection: AbstractSqlConnection, schemas?: string[]): Promise<SqlRoutineDef[]>;
@@ -131,6 +133,8 @@ export declare class PostgreSqlSchemaHelper extends SchemaHelper {
      * Build the column list for a PostgreSQL index.
      */
     protected getIndexColumns(index: IndexDef): string;
+    /** Non-default index access methods (gin, gist, brin, hash, ...), normalized to lower case. */
+    getIndexAccessMethod(index: IndexDef): string;
     /**
      * PostgreSQL-specific index options like fill factor.
      */