@mikro-orm/knex 6.0.0-dev.6 → 6.0.0-dev.60

package/AbstractSqlConnection.d.ts

@@ -7,6 +7,9 @@ export declare abstract class AbstractSqlConnection extends Connection {
     protected platform: AbstractSqlPlatform;
     protected client: Knex;
     constructor(config: Configuration, options?: ConnectionOptions, type?: 'read' | 'write');
+    abstract createKnex(): void;
+    /** @inheritDoc */
+    connect(): void | Promise<void>;
     getKnex(): Knex;
     close(force?: boolean): Promise<void>;
     isConnected(): Promise<boolean>;

package/AbstractSqlConnection.js

@@ -14,16 +14,23 @@ class AbstractSqlConnection extends core_1.Connection {
         super(config, options, type);
         this.patchKnexClient();
     }
+    /** @inheritDoc */
+    connect() {
+        this.createKnex();
+    }
     getKnex() {
+        if (!this.client) {
+            this.createKnex();
+        }
         return this.client;
     }
     async close(force) {
         await super.close(force);
-        await this.client.destroy();
+        await this.getKnex().destroy();
     }
     async isConnected() {
         try {
-            await this.client.raw('select 1');
+            await this.getKnex().raw('select 1');
             return true;
         }
         catch {
@@ -46,7 +53,7 @@ class AbstractSqlConnection extends core_1.Connection {
         if (!options.ctx) {
             await options.eventBroadcaster?.dispatchEvent(core_1.EventType.beforeTransactionStart);
         }
-        const trx = await (options.ctx || this.client).transaction(null, { isolationLevel: options.isolationLevel });
+        const trx = await (options.ctx || this.getKnex()).transaction(null, { isolationLevel: options.isolationLevel });
         if (!options.ctx) {
             await options.eventBroadcaster?.dispatchEvent(core_1.EventType.afterTransactionStart, trx);
         }
@@ -77,8 +84,9 @@ class AbstractSqlConnection extends core_1.Connection {
         }
     }
     async execute(queryOrKnex, params = [], method = 'all', ctx) {
+        await this.ensureConnection();
         if (core_1.Utils.isObject(queryOrKnex)) {
-            ctx ?? (ctx = queryOrKnex.client.transacting ? queryOrKnex : null);
+            ctx ??= (queryOrKnex.client.transacting ? queryOrKnex : null);
             const q = queryOrKnex.toSQL();
             queryOrKnex = q.sql;
             params = q.bindings;
@@ -86,7 +94,7 @@ class AbstractSqlConnection extends core_1.Connection {
         const formatted = this.platform.formatQuery(queryOrKnex, params);
         const sql = this.getSql(queryOrKnex, formatted);
         const res = await this.executeQuery(sql, () => {
-            const query = this.client.raw(formatted);
+            const query = this.getKnex().raw(formatted);
             if (ctx) {
                 query.transacting(ctx);
             }
@@ -99,7 +107,7 @@ class AbstractSqlConnection extends core_1.Connection {
      */
     async loadFile(path) {
         const buf = await (0, fs_extra_1.readFile)(path);
-        await this.client.raw(buf.toString());
+        await this.getKnex().raw(buf.toString());
     }
     createKnexClient(type) {
         const driverOptions = this.config.get('driverOptions');
@@ -146,7 +154,7 @@ class AbstractSqlConnection extends core_1.Connection {
         if (logger.isEnabled('query-params')) {
             return formatted;
         }
-        return this.client.client.positionBindings(query);
+        return this.getKnex().client.positionBindings(query);
     }
     /**
      * do not call `positionBindings` when there are no bindings - it was messing up with
@@ -177,5 +185,5 @@ class AbstractSqlConnection extends core_1.Connection {
         };
     }
 }
-exports.AbstractSqlConnection = AbstractSqlConnection;
 AbstractSqlConnection.__patched = false;
+exports.AbstractSqlConnection = AbstractSqlConnection;

package/AbstractSqlDriver.d.ts

@@ -1,26 +1,26 @@
 import type { Knex } from 'knex';
-import type { AnyEntity, Collection, ConnectionType, Configuration, Constructor, CountOptions, DeleteOptions, Dictionary, DriverMethodOptions, EntityData, EntityDictionary, EntityField, EntityMetadata, EntityName, EntityProperty, FilterQuery, FindOneOptions, FindOptions, IDatabaseDriver, LockOptions, NativeInsertUpdateManyOptions, NativeInsertUpdateOptions, PopulateOptions, Primary, QueryOrderMap, QueryResult, Transaction } from '@mikro-orm/core';
+import type { AnyEntity, Collection, ConnectionType, Configuration, Constructor, CountOptions, DeleteOptions, Dictionary, DriverMethodOptions, EntityData, EntityDictionary, EntityField, EntityMetadata, EntityName, EntityProperty, FilterQuery, FindOneOptions, FindOptions, IDatabaseDriver, LockOptions, NativeInsertUpdateManyOptions, NativeInsertUpdateOptions, PopulateOptions, Primary, QueryOrderMap, QueryResult, Transaction, OrderDefinition } from '@mikro-orm/core';
 import { DatabaseDriver, EntityManagerType } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from './AbstractSqlConnection';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform';
 import { QueryBuilder, QueryType } from './query';
 import { SqlEntityManager } from './SqlEntityManager';
 import type { Field } from './typings';
-export declare abstract class AbstractSqlDriver<C extends AbstractSqlConnection = AbstractSqlConnection> extends DatabaseDriver<C> {
+export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection = AbstractSqlConnection, Platform extends AbstractSqlPlatform = AbstractSqlPlatform> extends DatabaseDriver<Connection> {
     [EntityManagerType]: SqlEntityManager<this>;
-    protected readonly connection: C;
-    protected readonly replicas: C[];
-    protected readonly platform: AbstractSqlPlatform;
-    protected constructor(config: Configuration, platform: AbstractSqlPlatform, connection: Constructor<C>, connector: string[]);
-    getPlatform(): AbstractSqlPlatform;
+    protected readonly connection: Connection;
+    protected readonly replicas: Connection[];
+    protected readonly platform: Platform;
+    protected constructor(config: Configuration, platform: Platform, connection: Constructor<Connection>, connector: string[]);
+    getPlatform(): Platform;
     createEntityManager<D extends IDatabaseDriver = IDatabaseDriver>(useContext?: boolean): D[typeof EntityManagerType];
-    find<T extends object, P extends string = never>(entityName: string, where: FilterQuery<T>, options?: FindOptions<T, P>): Promise<EntityData<T>[]>;
-    findOne<T extends object, P extends string = never>(entityName: string, where: FilterQuery<T>, options?: FindOneOptions<T, P>): Promise<EntityData<T> | null>;
-    findVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: FindOptions<T, any>): Promise<EntityData<T>[]>;
+    find<T extends object, P extends string = never, F extends string = '*'>(entityName: string, where: FilterQuery<T>, options?: FindOptions<T, P, F>): Promise<EntityData<T>[]>;
+    findOne<T extends object, P extends string = never, F extends string = '*'>(entityName: string, where: FilterQuery<T>, options?: FindOneOptions<T, P, F>): Promise<EntityData<T> | null>;
+    findVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: FindOptions<T, any, any>): Promise<EntityData<T>[]>;
     countVirtual<T extends object>(entityName: string, where: FilterQuery<T>, options: CountOptions<T>): Promise<number>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any>, type: QueryType.COUNT): Promise<number>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any>, type: QueryType.SELECT): Promise<T[]>;
-    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any>): Promise<T[]>;
+    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>, type: QueryType.COUNT): Promise<number>;
+    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>, type: QueryType.SELECT): Promise<T[]>;
+    protected wrapVirtualExpressionInSubquery<T extends object>(meta: EntityMetadata<T>, expression: string, where: FilterQuery<T>, options: FindOptions<T, any, any>): Promise<T[]>;
     mapResult<T extends object>(result: EntityData<T>, meta: EntityMetadata<T>, populate?: PopulateOptions<T>[], qb?: QueryBuilder<T>, map?: Dictionary): EntityData<T> | null;
     private mapJoinedProps;
     private appendToCollection;
@@ -31,12 +31,12 @@ export declare abstract class AbstractSqlDriver<C extends AbstractSqlConnection
     nativeUpdateMany<T extends object>(entityName: string, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
     nativeDelete<T extends object>(entityName: string, where: FilterQuery<T> | string | any, options?: DeleteOptions<T>): Promise<QueryResult<T>>;
     syncCollection<T extends object, O extends object>(coll: Collection<T, O>, options?: DriverMethodOptions): Promise<void>;
-    loadFromPivotTable<T extends object, O extends object>(prop: EntityProperty, owners: Primary<O>[][], where?: FilterQuery<any>, orderBy?: QueryOrderMap<T>[], ctx?: Transaction, options?: FindOptions<T, any>): Promise<Dictionary<T[]>>;
+    loadFromPivotTable<T extends object, O extends object>(prop: EntityProperty, owners: Primary<O>[][], where?: FilterQuery<any>, orderBy?: OrderDefinition<T>, ctx?: Transaction, options?: FindOptions<T, any, any>): Promise<Dictionary<T[]>>;
     execute<T extends QueryResult | EntityData<AnyEntity> | EntityData<AnyEntity>[] = EntityData<AnyEntity>[]>(queryOrKnex: string | Knex.QueryBuilder | Knex.Raw, params?: any[], method?: 'all' | 'get' | 'run', ctx?: Transaction): Promise<T>;
     /**
      * 1:1 owner side needs to be marked for population so QB auto-joins the owner id
      */
-    protected autoJoinOneToOneOwner<T extends object, P extends string = never>(meta: EntityMetadata, populate: PopulateOptions<T>[], fields?: readonly EntityField<T, P>[]): PopulateOptions<T>[];
+    protected autoJoinOneToOneOwner<T extends object, P extends string = never>(meta: EntityMetadata<T>, populate: PopulateOptions<T>[], fields?: readonly EntityField<T, P>[]): PopulateOptions<T>[];
     protected joinedProps<T>(meta: EntityMetadata, populate: PopulateOptions<T>[]): PopulateOptions<T>[];
     /**
      * @internal
@@ -58,7 +58,7 @@ export declare abstract class AbstractSqlDriver<C extends AbstractSqlConnection
     protected updateCollectionDiff<T extends object, O extends object>(meta: EntityMetadata<O>, prop: EntityProperty<T>, pks: Primary<O>[], deleteDiff: Primary<T>[][] | boolean, insertDiff: Primary<T>[][], options?: DriverMethodOptions & {
         ownerSchema?: string;
     }): Promise<void>;
-    lockPessimistic<T>(entity: T, options: LockOptions): Promise<void>;
+    lockPessimistic<T extends object>(entity: T, options: LockOptions): Promise<void>;
     protected buildJoinedPropsOrderBy<T extends object>(entityName: string, qb: QueryBuilder<T>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], parentPath?: string): QueryOrderMap<T>[];
     protected normalizeFields<T extends object>(fields: Field<T>[], prefix?: string): string[];
     protected processField<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T> | undefined, field: string, ret: Field<T>[], populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T>): void;

package/AbstractSqlDriver.js

@@ -29,16 +29,25 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false);
         const fields = this.buildFields(meta, populate, joinedProps, qb, options.fields);
         const joinedPropsOrderBy = this.buildJoinedPropsOrderBy(entityName, qb, meta, joinedProps);
+        const orderBy = [...core_1.Utils.asArray(options.orderBy), ...joinedPropsOrderBy];
         if (core_1.Utils.isPrimaryKey(where, meta.compositePK)) {
             where = { [core_1.Utils.getPrimaryKeyHash(meta.primaryKeys)]: where };
         }
+        const { first, last, before, after } = options;
+        const isCursorPagination = [first, last, before, after].some(v => v != null);
         qb.select(fields)
             .populate(populate, joinedProps.length > 0 ? options.populateWhere : undefined)
             .where(where)
-            .orderBy([...core_1.Utils.asArray(options.orderBy), ...joinedPropsOrderBy])
             .groupBy(options.groupBy)
             .having(options.having)
             .withSchema(this.getSchemaName(meta, options));
+        if (isCursorPagination) {
+            const { orderBy: newOrderBy, where } = this.processCursorOptions(meta, options, orderBy);
+            qb.andWhere(where).orderBy(newOrderBy);
+        }
+        else {
+            qb.orderBy(orderBy);
+        }
         if (options.limit !== undefined) {
             qb.limit(options.limit, options.offset);
         }
@@ -47,6 +56,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         core_1.Utils.asArray(options.flags).forEach(flag => qb.setFlag(flag));
         const result = await this.rethrow(qb.execute('all'));
+        if (isCursorPagination && !first && !!last) {
+            result.reverse();
+        }
         if (joinedProps.length > 0) {
             return this.mergeJoinedResult(result, meta);
         }
@@ -61,7 +73,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             opts.limit = 1;
         }
         if (opts.limit > 0 && !opts.flags?.includes(core_1.QueryFlag.DISABLE_PAGINATE)) {
-            opts.flags ?? (opts.flags = []);
+            opts.flags ??= [];
             opts.flags.push(core_1.QueryFlag.DISABLE_PAGINATE);
         }
         const res = await this.find(entityName, where, opts);
@@ -112,7 +124,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         qb.where(where);
         const kqb = qb.getKnexQuery().clear('select');
         if (type === query_1.QueryType.COUNT) {
-            kqb.select(qb.raw('count(*) as count'));
+            kqb.select(this.connection.getKnex().raw('count(*) as count'));
         }
         else { // select
             kqb.select('*');
@@ -154,8 +166,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             }));
             if (!hasPK) {
                 // initialize empty collections
-                if ([core_1.ReferenceType.MANY_TO_MANY, core_1.ReferenceType.ONE_TO_MANY].includes(relation.reference)) {
-                    result[relation.name] = result[relation.name] || [];
+                if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(relation.kind)) {
+                    result[relation.name] ??= [];
                 }
                 return;
             }
@@ -179,8 +191,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             else {
                 map[key] = result;
             }
-            if ([core_1.ReferenceType.MANY_TO_MANY, core_1.ReferenceType.ONE_TO_MANY].includes(relation.reference)) {
-                result[relation.name] = result[relation.name] || [];
+            if ([core_1.ReferenceKind.MANY_TO_MANY, core_1.ReferenceKind.ONE_TO_MANY].includes(relation.kind)) {
+                result[relation.name] ??= [];
                 this.appendToCollection(meta2, result[relation.name], relationPojo);
             }
             else {
@@ -215,7 +227,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return this.rethrow(qb.getCount());
     }
     async nativeInsert(entityName, data, options = {}) {
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const collections = this.extractManyToMany(entityName, data);
         const pks = meta?.primaryKeys ?? [this.config.getNamingStrategy().referenceColumnName()];
@@ -235,16 +247,20 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeInsertMany(entityName, data, options = {}) {
-        options.processCollections ?? (options.processCollections = true);
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.processCollections ??= true;
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
         const pks = this.getPrimaryKeyFields(entityName);
         const set = new Set();
-        data.forEach(row => Object.keys(row).forEach(k => set.add(k)));
+        data.forEach(row => core_1.Utils.keys(row).forEach(k => set.add(k)));
         const props = [...set].map(name => meta?.properties[name] ?? { name, fieldNames: [name] });
-        const fields = core_1.Utils.flatten(props.map(prop => prop.fieldNames));
+        let fields = core_1.Utils.flatten(props.map(prop => prop.fieldNames));
+        const duplicates = core_1.Utils.findDuplicates(fields);
         const params = [];
+        if (duplicates.length) {
+            fields = core_1.Utils.unique(fields);
+        }
         /* istanbul ignore next */
         const tableName = meta ? this.getTableName(meta, options) : this.platform.quoteIdentifier(entityName);
         let sql = `insert into ${tableName} `;
@@ -255,29 +271,45 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         else {
             sql += ' ' + data.map(() => `select null as ${this.platform.quoteIdentifier(pks[0])}`).join(' union all ');
         }
+        const addParams = (prop, row) => {
+            if (options.convertCustomTypes && prop.customType) {
+                params.push(prop.customType.convertToDatabaseValue(row[prop.name], this.platform, { key: prop.name, mode: 'query-data' }));
+                return;
+            }
+            params.push(row[prop.name]);
+        };
         if (fields.length > 0 || this.platform.usesDefaultKeyword()) {
             sql += data.map(row => {
                 const keys = [];
                 props.forEach(prop => {
                     if (prop.fieldNames.length > 1) {
-                        params.push(...(row[prop.name] ?? prop.fieldNames.map(() => null)));
-                        keys.push(...prop.fieldNames.map(_ => '?'));
+                        const param = row[prop.name] ?? prop.fieldNames.map(() => null);
+                        const key = (row[prop.name] ?? prop.fieldNames).map(() => '?');
+                        prop.fieldNames.forEach((field, idx) => {
+                            if (duplicates.includes(field)) {
+                                param.splice(idx, 1);
+                                key.splice(idx, 1);
+                            }
+                        });
+                        params.push(...param);
+                        keys.push(...key);
                     }
                     else if (prop.customType && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(row[prop.name])) {
                         keys.push(prop.customType.convertToDatabaseValueSQL('?', this.platform));
-                        params.push(row[prop.name]);
+                        addParams(prop, row);
                     }
                     else {
-                        params.push(row[prop.name]);
+                        addParams(prop, row);
                         keys.push('?');
                     }
                 });
                 return '(' + (keys.join(', ') || 'default') + ')';
             }).join(', ');
         }
-        if (this.platform.usesReturningStatement()) {
-            /* istanbul ignore next */
-            const returningProps = meta.hydrateProps.filter(prop => prop.persist !== false && (prop.primary || prop.defaultRaw));
+        if (meta && this.platform.usesReturningStatement()) {
+            const returningProps = meta.hydrateProps
+                .filter(prop => prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw))
+                .filter(prop => !(prop.name in data[0]) || core_1.Utils.isRawSql(data[0][prop.name]));
             const returningFields = core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames));
             /* istanbul ignore next */
             sql += returningFields.length > 0 ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}` : '';
@@ -289,8 +321,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             pk = data.map(d => core_1.Utils.getPrimaryKeyCond(d, pks));
         }
         else {
-            res.row ?? (res.row = {});
-            res.rows ?? (res.rows = []);
+            res.row ??= {};
+            res.rows ??= [];
             pk = data.map((d, i) => d[pks[0]] ?? res.rows[i]?.[pks[0]]).map(d => [d]);
             res.insertId = res.insertId || res.row[pks[0]];
         }
@@ -300,7 +332,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeUpdate(entityName, where, data, options = {}) {
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.find(entityName);
         const pks = this.getPrimaryKeyFields(entityName);
         const collections = this.extractManyToMany(entityName, data);
@@ -314,11 +346,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 .withSchema(this.getSchemaName(meta, options));
             if (options.upsert) {
                 /* istanbul ignore next */
-                const uniqueFields = core_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys;
+                const uniqueFields = core_1.Utils.isPlainObject(where) ? core_1.Utils.keys(where) : meta.primaryKeys;
                 /* istanbul ignore next */
                 qb.insert(data)
                     .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
-                    .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)));
+                    .merge(core_1.Utils.keys(data).filter(f => !uniqueFields.includes(f)));
             }
             else {
                 qb.update(data).where(where);
@@ -331,12 +363,28 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async nativeUpdateMany(entityName, where, data, options = {}) {
-        options.processCollections ?? (options.processCollections = true);
-        options.convertCustomTypes ?? (options.convertCustomTypes = true);
+        options.processCollections ??= true;
+        options.convertCustomTypes ??= true;
         const meta = this.metadata.get(entityName);
+        if (options.upsert) {
+            const uniqueFields = core_1.Utils.isPlainObject(where[0]) ? Object.keys(where[0]) : meta.primaryKeys;
+            const qb = this.createQueryBuilder(entityName, options.ctx, 'write', options.convertCustomTypes).withSchema(this.getSchemaName(meta, options));
+            qb.insert(data)
+                .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
+                .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)));
+            return qb.execute('run', false);
+        }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
         const keys = new Set();
-        data.forEach(row => Object.keys(row).forEach(k => keys.add(k)));
+        const returning = new Set();
+        data.forEach(row => {
+            core_1.Utils.keys(row).forEach(k => {
+                keys.add(k);
+                if (core_1.Utils.isRawSql(row[k])) {
+                    returning.add(k);
+                }
+            });
+        });
         const pkCond = core_1.Utils.flatten(meta.primaryKeys.map(pk => meta.properties[pk].fieldNames)).map(pk => `${this.platform.quoteIdentifier(pk)} = ?`).join(' and ');
         const params = [];
         let sql = `update ${this.getTableName(meta, options)} set `;
@@ -396,6 +444,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return '?';
         });
         sql += ` in (${conds.join(', ')})`;
+        if (this.platform.usesReturningStatement() && returning.size > 0) {
+            const returningFields = core_1.Utils.flatten([...returning].map(prop => meta.properties[prop].fieldNames));
+            /* istanbul ignore next */
+            sql += returningFields.length > 0 ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}` : '';
+        }
         const res = await this.rethrow(this.execute(sql, params, 'run', options.ctx));
         for (let i = 0; i < collections.length; i++) {
             await this.processManyToMany(meta, where[i], collections[i], false, options);
@@ -430,7 +483,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             deleteDiff.push(...snapshot);
             insertDiff.push(...current);
         }
-        if (coll.property.reference === core_1.ReferenceType.ONE_TO_MANY) {
+        if (coll.property.kind === core_1.ReferenceKind.ONE_TO_MANY) {
             const cols = coll.property.referencedColumnNames;
             const qb = this.createQueryBuilder(coll.property.type, ctx, 'write')
                 .withSchema(this.getSchemaName(meta, options))
@@ -444,7 +497,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const pivotMeta = this.metadata.find(coll.property.pivotEntity);
         if (pivotMeta.schema === '*') {
             /* istanbul ignore next */
-            options ?? (options = {});
+            options ??= {};
             options.schema = ownerSchema;
         }
         return this.rethrow(this.updateCollectionDiff(meta, coll.property, pks, deleteDiff, insertDiff, options));
@@ -512,7 +565,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const relationsToPopulate = populate.map(({ field }) => field);
         const toPopulate = meta.relations
-            .filter(prop => prop.reference === core_1.ReferenceType.ONE_TO_ONE && !prop.owner && !relationsToPopulate.includes(prop.name))
+            .filter(prop => prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner && !relationsToPopulate.includes(prop.name))
             .filter(prop => fields.length === 0 || fields.some(f => prop.name === f || prop.name.startsWith(`${String(f)}.`)))
             .map(prop => ({ field: prop.name, strategy: prop.strategy }));
         return [...populate, ...toPopulate];
@@ -520,7 +573,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     joinedProps(meta, populate) {
         return populate.filter(p => {
             const prop = meta.properties[p.field] || {};
-            return (p.strategy || prop.strategy || this.config.get('loadStrategy')) === core_1.LoadStrategy.JOINED && prop.reference !== core_1.ReferenceType.SCALAR;
+            return (p.strategy || prop.strategy || this.config.get('loadStrategy')) === core_1.LoadStrategy.JOINED && prop.kind !== core_1.ReferenceKind.SCALAR;
         });
     }
     /**
@@ -545,14 +598,17 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     getFieldsForJoinedLoad(qb, meta, explicitFields, populate = [], parentTableAlias, parentJoinPath) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate);
+        if (explicitFields?.includes('*')) {
+            fields.push('*');
+        }
         const shouldHaveColumn = (prop, populate, fields) => {
             if (!this.platform.shouldHaveColumn(prop, populate)) {
                 return false;
             }
             if (!fields || prop.primary) {
-                return true;
+                return !fields?.includes('*');
             }
-            return fields.includes(prop.name);
+            return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
         };
         // alias all fields in the primary table
         meta.props
@@ -582,11 +638,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const aliased = qb.ref(tableAlias ? `${tableAlias}__${prop.fieldNames[0]}` : prop.fieldNames[0]).toString();
         if (prop.customType?.convertToJSValueSQL && tableAlias) {
             const prefixed = qb.ref(prop.fieldNames[0]).withSchema(tableAlias).toString();
-            return [qb.raw(prop.customType.convertToJSValueSQL(prefixed, this.platform) + ' as ' + aliased).toString()];
+            return [(0, core_1.raw)(`${prop.customType.convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`)];
         }
         if (prop.formula) {
             const alias = qb.ref(tableAlias ?? qb.alias).toString();
-            return [`${prop.formula(alias)} as ${aliased}`];
+            return [(0, core_1.raw)(`${prop.formula(alias)} as ${aliased}`)];
         }
         if (tableAlias) {
             return prop.fieldNames.map(fieldName => qb.ref(fieldName).withSchema(tableAlias).as(`${tableAlias}__${fieldName}`));
@@ -620,7 +676,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const ret = {};
         this.metadata.find(entityName).relations.forEach(prop => {
-            if (prop.reference === core_1.ReferenceType.MANY_TO_MANY && data[prop.name]) {
+            if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY && data[prop.name]) {
                 ret[prop.name] = data[prop.name].map((item) => core_1.Utils.asArray(item));
                 delete data[prop.name];
             }
@@ -663,7 +719,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         });
         /* istanbul ignore else */
         if (this.platform.allowsMultiInsert()) {
-            await this.nativeInsertMany(prop.pivotEntity, items, { ...options, convertCustomTypes: false, processCollections: false });
+            await this.nativeInsertMany(prop.pivotEntity, items, {
+                ...options,
+                convertCustomTypes: false,
+                processCollections: false,
+            });
         }
         else {
             await core_1.Utils.runSerial(items, item => {
@@ -679,7 +739,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const meta = (0, core_1.helper)(entity).__meta;
         const qb = this.createQueryBuilder(entity.constructor.name, options.ctx).unsetFlag(core_1.QueryFlag.CONVERT_CUSTOM_TYPES).withSchema(options.schema ?? meta.schema);
         const cond = core_1.Utils.getPrimaryKeyCond(entity, meta.primaryKeys);
-        qb.select('1').where(cond).setLockMode(options.lockMode, options.lockTableAliases);
+        qb.select((0, core_1.raw)('1')).where(cond).setLockMode(options.lockMode, options.lockTableAliases);
         await this.rethrow(qb.execute());
     }
     buildJoinedPropsOrderBy(entityName, qb, meta, populate, parentPath) {
@@ -691,7 +751,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const path = `${parentPath ? parentPath : entityName}.${relation.field}`;
             const propAlias = qb.getAliasForJoinPath(path);
             if (propOrderBy) {
-                Object.keys(propOrderBy).forEach(field => {
+                core_1.Utils.keys(propOrderBy).forEach(field => {
                     orderBy.push({ [`${propAlias}.${field}`]: propOrderBy[field] });
                 });
             }
@@ -718,10 +778,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return ret;
     }
     processField(meta, prop, field, ret, populate, joinedProps, qb) {
-        if (!prop || (prop.reference === core_1.ReferenceType.ONE_TO_ONE && !prop.owner)) {
+        if (!prop || (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner)) {
             return;
         }
-        if (prop.reference === core_1.ReferenceType.EMBEDDED) {
+        if (prop.kind === core_1.ReferenceKind.EMBEDDED) {
             if (prop.object) {
                 ret.push(prop.fieldNames[0]);
                 return;
@@ -736,7 +796,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return;
         }
         if (prop.fieldNames) {
-            ret.push(prop.fieldNames[0]);
+            ret.push(...prop.fieldNames);
         }
     }
     buildFields(meta, populate, joinedProps, qb, fields) {
@@ -745,6 +805,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const requiresSQLConversion = meta.props.some(p => p.customType?.convertToJSValueSQL);
         const hasExplicitFields = !!fields;
         const ret = [];
+        let addFormulas = false;
         if (joinedProps.length > 0) {
             ret.push(...this.getFieldsForJoinedLoad(qb, meta, fields, populate));
         }
@@ -770,17 +831,19 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         else if (lazyProps.filter(p => !p.formula).length > 0) {
             const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, false));
             ret.push(...core_1.Utils.flatten(props.filter(p => !lazyProps.includes(p)).map(p => p.fieldNames)));
+            addFormulas = true;
         }
         else if (hasLazyFormulas || requiresSQLConversion) {
             ret.push('*');
+            addFormulas = true;
         }
-        if (ret.length > 0 && !hasExplicitFields) {
+        if (ret.length > 0 && !hasExplicitFields && addFormulas) {
             meta.props
                 .filter(prop => prop.formula && !lazyProps.includes(prop))
                 .forEach(prop => {
                 const alias = qb.ref(qb.alias).toString();
                 const aliased = qb.ref(prop.fieldNames[0]).toString();
-                ret.push(`${prop.formula(alias)} as ${aliased}`);
+                ret.push((0, core_1.raw)(`${prop.formula(alias)} as ${aliased}`));
             });
             meta.props
                 .filter(prop => prop.customType?.convertToDatabaseValueSQL || prop.customType?.convertToJSValueSQL)

package/AbstractSqlPlatform.d.ts

@@ -1,7 +1,7 @@
 import type { Constructor, EntityManager, EntityRepository, IDatabaseDriver, MikroORM } from '@mikro-orm/core';
 import { Platform } from '@mikro-orm/core';
 import type { SchemaHelper } from './schema';
-import { SchemaGenerator } from './schema';
+import { SqlSchemaGenerator } from './schema';
 export declare abstract class AbstractSqlPlatform extends Platform {
     protected readonly schemaHelper?: SchemaHelper;
     usesPivotTable(): boolean;
@@ -10,7 +10,7 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     getSchemaHelper(): SchemaHelper | undefined;
     /** @inheritDoc */
     lookupExtensions(orm: MikroORM): void;
-    getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SchemaGenerator;
+    getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SqlSchemaGenerator;
     quoteValue(value: any): string;
     formatQuery(sql: string, params: readonly any[]): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string;

package/AbstractSqlPlatform.js

@@ -20,13 +20,16 @@ class AbstractSqlPlatform extends core_1.Platform {
     }
     /** @inheritDoc */
     lookupExtensions(orm) {
-        schema_1.SchemaGenerator.register(orm);
+        schema_1.SqlSchemaGenerator.register(orm);
     }
     /* istanbul ignore next: kept for type inference only */
     getSchemaGenerator(driver, em) {
-        return new schema_1.SchemaGenerator(em ?? driver);
+        return new schema_1.SqlSchemaGenerator(em ?? driver);
     }
     quoteValue(value) {
+        if (core_1.Utils.isRawSql(value)) {
+            return this.formatQuery(value.sql, value.params ?? []);
+        }
         if (this.isRaw(value)) {
             return value;
         }
@@ -45,22 +48,26 @@ class AbstractSqlPlatform extends core_1.Platform {
         let j = 0;
         let pos = 0;
         let ret = '';
+        if (sql[0] === '?' && sql[1] !== '?') {
+            ret += this.quoteValue(params[j++]);
+            pos = 1;
+        }
         while (pos < sql.length) {
             const idx = sql.indexOf('?', pos + 1);
             if (idx === -1) {
                 ret += sql.substring(pos, sql.length);
                 break;
             }
-            if (sql.substr(idx - 1, 2) === '\\?') {
-                ret += sql.substr(pos, idx - pos - 1) + '?';
+            if (sql.substring(idx - 1, idx + 1) === '\\?') {
+                ret += sql.substring(pos, idx - 1) + '?';
                 pos = idx + 1;
             }
-            else if (sql.substr(idx, 2) === '??') {
-                ret += sql.substr(pos, idx - pos) + this.quoteIdentifier(params[j++]);
+            else if (sql.substring(idx, idx + 2) === '??') {
+                ret += sql.substring(pos, idx) + this.quoteIdentifier(params[j++]);
                 pos = idx + 2;
             }
             else {
-                ret += sql.substr(pos, idx - pos) + this.quoteValue(params[j++]);
+                ret += sql.substring(pos, idx) + this.quoteValue(params[j++]);
                 pos = idx + 1;
             }
         }

package/MonkeyPatchable.d.ts

@@ -3,6 +3,7 @@ export declare const MonkeyPatchable: {
     QueryExecutioner: any;
     MySqlDialect: any;
     MySqlColumnCompiler: any;
+    MySqlQueryCompiler: any;
     PostgresDialectTableCompiler: any;
     Sqlite3Dialect: any;
     Sqlite3DialectTableCompiler: any;