@mikro-orm/core 6.4.7-dev.1 → 7.0.0-dev.1

package/typings.d.ts

@@ -1,12 +1,18 @@
 import type { Transaction } from './connections';
 import { type Cascade, type DeferMode, type EventType, type LoadStrategy, type PopulatePath, type QueryOrderMap, ReferenceKind } from './enums';
-import { type AssignOptions, type Collection, type EntityFactory, type EntityIdentifier, type EntityLoaderOptions, type EntityRepository, Reference, type ScalarReference } from './entity';
+import { type AssignOptions } from './entity/EntityAssigner';
+import { type EntityIdentifier } from './entity/EntityIdentifier';
+import { type EntityLoaderOptions } from './entity/EntityLoader';
+import { type Collection } from './entity/Collection';
+import { type EntityFactory } from './entity/EntityFactory';
+import { type EntityRepository } from './entity/EntityRepository';
+import { Reference, type ScalarReference } from './entity/Reference';
 import type { MikroORM } from './MikroORM';
 import type { SerializationContext, SerializeOptions } from './serialization';
 import type { EntitySchema, MetadataStorage } from './metadata';
 import type { Type, types } from './types';
 import type { Platform } from './platforms';
-import type { Configuration } from './utils';
+import type { Configuration, RawQueryFragment } from './utils';
 import type { EntityManager } from './EntityManager';
 import type { EmbeddedPrefixMode } from './decorators/Embedded';
 import type { EventSubscriber } from './events';
@@ -391,7 +397,7 @@ export declare class EntityMetadata<T = any> {
     getPrimaryProp(): EntityProperty<T>;
     get tableName(): string;
     set tableName(name: string);
-    sync(initIndexes?: boolean): void;
+    sync(initIndexes?: boolean, config?: Configuration): void;
     private initIndexes;
     /** @internal */
     clone(): this;
@@ -407,7 +413,7 @@ export interface EntityMetadata<T = any> {
     schema?: string;
     pivotTable?: boolean;
     virtual?: boolean;
-    expression?: string | ((em: any, where: FilterQuery<T>, options: FindOptions<T, any, any, any>) => MaybePromise<object | string>);
+    expression?: string | ((em: any, where: FilterQuery<T>, options: FindOptions<T, any, any, any>) => MaybePromise<RawQueryFragment | object | string>);
     discriminatorColumn?: EntityKey<T> | AnyString;
     discriminatorValue?: number | string;
     discriminatorMap?: Dictionary<string>;
@@ -505,6 +511,7 @@ export interface UpdateSchemaOptions<DatabaseSchema = unknown> {
 export interface RefreshDatabaseOptions extends CreateSchemaOptions {
     ensureIndexes?: boolean;
     dropDb?: boolean;
+    createSchema?: boolean;
 }
 export interface ISchemaGenerator {
     createSchema(options?: CreateSchemaOptions): Promise<void>;
@@ -577,6 +584,7 @@ export type MigrationResult = {
     diff: MigrationDiff;
 };
 export type MigrationRow = {
+    id: number;
     name: string;
     executed_at: Date;
 };

package/typings.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityMetadata = exports.Config = exports.HiddenProps = exports.EagerProps = exports.OptionalProps = exports.PrimaryKeyProp = exports.EntityRepositoryType = void 0;
 const enums_1 = require("./enums");
-const entity_1 = require("./entity");
+const Reference_1 = require("./entity/Reference");
+const EntityHelper_1 = require("./entity/EntityHelper");
 const Utils_1 = require("./utils/Utils");
 const EntityComparator_1 = require("./utils/EntityComparator");
 exports.EntityRepositoryType = Symbol('EntityRepositoryType');
@@ -59,7 +60,7 @@ class EntityMetadata {
     set tableName(name) {
         this.collection = name;
     }
-    sync(initIndexes = false) {
+    sync(initIndexes = false, config) {
         this.root ??= this;
         const props = Object.values(this.properties).sort((a, b) => this.propertyOrder.get(a.name) - this.propertyOrder.get(b.name));
         this.props = [...props.filter(p => p.primary), ...props.filter(p => !p.primary)];
@@ -82,6 +83,22 @@ class EntityMetadata {
         this.selfReferencing = this.relations.some(prop => [this.className, this.root.className].includes(prop.targetMeta?.root.className ?? prop.type));
         this.hasUniqueProps = this.uniques.length + this.uniqueProps.length > 0;
         this.virtual = !!this.expression;
+        if (config) {
+            for (const prop of this.props) {
+                if (prop.enum && !prop.nativeEnumName && prop.items?.every(item => Utils_1.Utils.isString(item))) {
+                    const name = config.getNamingStrategy().indexName(this.tableName, prop.fieldNames, 'check');
+                    const exists = this.checks.findIndex(check => check.name === name);
+                    if (exists !== -1) {
+                        this.checks.splice(exists, 1);
+                    }
+                    this.checks.push({
+                        name,
+                        property: prop.name,
+                        expression: `${config.getPlatform().quoteIdentifier(prop.fieldNames[0])} in ('${prop.items.join("', '")}')`,
+                    });
+                }
+            }
+        }
         this.checks = Utils_1.Utils.removeDuplicates(this.checks);
         this.indexes = Utils_1.Utils.removeDuplicates(this.indexes);
         this.uniques = Utils_1.Utils.removeDuplicates(this.uniques);
@@ -107,9 +124,9 @@ class EntityMetadata {
                     set(val) {
                         const wrapped = this.__helper;
                         const hydrator = wrapped.hydrator;
-                        const entity = entity_1.Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
-                        const old = entity_1.Reference.unwrapReference(wrapped.__data[prop.name]);
-                        wrapped.__data[prop.name] = entity_1.Reference.wrapReference(val, prop);
+                        const entity = Reference_1.Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
+                        const old = Reference_1.Reference.unwrapReference(wrapped.__data[prop.name]);
+                        wrapped.__data[prop.name] = Reference_1.Reference.wrapReference(val, prop);
                         // when propagation from inside hydration, we set the FK to the entity data immediately
                         if (val && hydrator.isRunning() && wrapped.__originalEntityData && prop.owner) {
                             wrapped.__originalEntityData[prop.name] = Utils_1.Utils.getPrimaryKeyValues(val, prop.targetMeta.primaryKeys, true);
@@ -117,7 +134,7 @@ class EntityMetadata {
                         else {
                             wrapped.__touched = !hydrator.isRunning();
                         }
-                        entity_1.EntityHelper.propagate(meta, entity, this, prop, entity_1.Reference.unwrapReference(val), old);
+                        EntityHelper_1.EntityHelper.propagate(meta, entity, this, prop, Reference_1.Reference.unwrapReference(val), old);
                     },
                     enumerable: true,
                     configurable: true,

package/unit-of-work/ChangeSetComputer.d.ts

@@ -1,4 +1,4 @@
-import { type Configuration } from '../utils';
+import { type Configuration } from '../utils/Configuration';
 import type { MetadataStorage } from '../metadata';
 import type { AnyEntity } from '../typings';
 import { ChangeSet } from './ChangeSet';

package/unit-of-work/ChangeSetComputer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSetComputer = void 0;
-const utils_1 = require("../utils");
+const Utils_1 = require("../utils/Utils");
 const ChangeSet_1 = require("./ChangeSet");
 const entity_1 = require("../entity");
 const enums_1 = require("../enums");
@@ -48,7 +48,7 @@ class ChangeSetComputer {
         for (const prop of meta.relations.filter(prop => prop.persist !== false || prop.userDefined === false)) {
             this.processProperty(changeSet, prop);
         }
-        if (changeSet.type === ChangeSet_1.ChangeSetType.UPDATE && !utils_1.Utils.hasObjectKeys(changeSet.payload)) {
+        if (changeSet.type === ChangeSet_1.ChangeSetType.UPDATE && !Utils_1.Utils.hasObjectKeys(changeSet.payload)) {
             return null;
         }
         // Execute `onCreate` and `onUpdate` on properties recursively, saves `onUpdate` results
@@ -66,7 +66,7 @@ class ChangeSetComputer {
             }
             // Recompute the changeset, we need to merge this as here we ignore relations.
             const diff = this.computePayload(entity, true);
-            utils_1.Utils.merge(changeSet.payload, diff);
+            Utils_1.Utils.merge(changeSet.payload, diff);
         }
         return changeSet;
     }
@@ -77,7 +77,7 @@ class ChangeSetComputer {
         if (prop.onCreate
             && type === ChangeSet_1.ChangeSetType.CREATE
             && (entity[prop.name] == null
-                || (utils_1.Utils.isScalarReference(entity[prop.name]) && entity[prop.name].unwrap() == null))) {
+                || (Utils_1.Utils.isScalarReference(entity[prop.name]) && entity[prop.name].unwrap() == null))) {
             entity[prop.name] = prop.onCreate(entity, this.em);
         }
         if (prop.onUpdate && type === ChangeSet_1.ChangeSetType.UPDATE) {
@@ -106,7 +106,7 @@ class ChangeSetComputer {
             const comparator = this.comparator.getEntityComparator(entityName);
             const diff = comparator(originalEntityData, data);
             if (ignoreUndefined) {
-                utils_1.Utils.keys(diff)
+                Utils_1.Utils.keys(diff)
                     .filter(k => diff[k] === undefined)
                     .forEach(k => delete diff[k]);
             }
@@ -116,11 +116,11 @@ class ChangeSetComputer {
     }
     processProperty(changeSet, prop, target) {
         if (!target) {
-            const targets = utils_1.Utils.unwrapProperty(changeSet.entity, changeSet.meta, prop);
+            const targets = Utils_1.Utils.unwrapProperty(changeSet.entity, changeSet.meta, prop);
             targets.forEach(([t]) => this.processProperty(changeSet, prop, t));
             return;
         }
-        if (utils_1.Utils.isCollection(target)) { // m:n or 1:m
+        if (Utils_1.Utils.isCollection(target)) { // m:n or 1:m
             this.processToMany(prop, changeSet);
         }
         if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind)) {
@@ -132,10 +132,10 @@ class ChangeSetComputer {
         if (!isToOneOwner || prop.mapToPk) {
             return;
         }
-        const targets = utils_1.Utils.unwrapProperty(changeSet.entity, changeSet.meta, prop);
+        const targets = Utils_1.Utils.unwrapProperty(changeSet.entity, changeSet.meta, prop);
         targets.forEach(([target, idx]) => {
             if (!target.__helper.hasPrimaryKey()) {
-                utils_1.Utils.setPayloadProperty(changeSet.payload, this.metadata.find(changeSet.name), prop, target.__helper.__identifier, idx);
+                Utils_1.Utils.setPayloadProperty(changeSet.payload, this.metadata.find(changeSet.name), prop, target.__helper.__identifier, idx);
             }
         });
     }

package/unit-of-work/ChangeSetPersister.d.ts

@@ -2,7 +2,7 @@ import type { MetadataStorage } from '../metadata';
 import type { Dictionary, EntityDictionary, EntityMetadata, IHydrator } from '../typings';
 import { type EntityFactory, type EntityValidator } from '../entity';
 import { type ChangeSet } from './ChangeSet';
-import { type Configuration } from '../utils';
+import { type Configuration } from '../utils/Configuration';
 import type { DriverMethodOptions, IDatabaseDriver } from '../drivers';
 export declare class ChangeSetPersister {
     private readonly driver;

package/unit-of-work/ChangeSetPersister.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSetPersister = void 0;
 const entity_1 = require("../entity");
 const ChangeSet_1 = require("./ChangeSet");
-const utils_1 = require("../utils");
+const RawQueryFragment_1 = require("../utils/RawQueryFragment");
+const Utils_1 = require("../utils/Utils");
 const errors_1 = require("../errors");
 const enums_1 = require("../enums");
 class ChangeSetPersister {
@@ -59,7 +60,7 @@ class ChangeSetPersister {
         }
         const size = this.config.get('batchSize');
         const meta = changeSets[0].meta;
-        const pk = utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
+        const pk = Utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
         for (let i = 0; i < changeSets.length; i += size) {
             const chunk = changeSets.slice(i, i + size);
             const pks = chunk.map(cs => cs.getPrimaryKey());
@@ -190,7 +191,7 @@ class ChangeSetPersister {
         }
         const res = await this.driver.nativeUpdateMany(meta.className, cond, payload, options);
         const map = new Map();
-        res.rows?.forEach(item => map.set(utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
+        res.rows?.forEach(item => map.set(Utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
         for (const changeSet of changeSets) {
             if (res.rows) {
                 const row = map.get((0, entity_1.helper)(changeSet.entity).getSerializedPrimaryKey());
@@ -224,10 +225,10 @@ class ChangeSetPersister {
         (0, entity_1.helper)(changeSet.entity).populated();
         meta.relations.forEach(prop => {
             const value = changeSet.entity[prop.name];
-            if (utils_1.Utils.isEntity(value, true)) {
+            if (Utils_1.Utils.isEntity(value, true)) {
                 value.__helper.populated();
             }
-            else if (utils_1.Utils.isCollection(value)) {
+            else if (Utils_1.Utils.isCollection(value)) {
                 value.populated();
             }
         });
@@ -253,7 +254,7 @@ class ChangeSetPersister {
         // skip entity references as they don't have version values loaded
         changeSets = changeSets.filter(cs => (0, entity_1.helper)(cs.entity).__initialized);
         const $or = changeSets.map(cs => {
-            const cond = utils_1.Utils.getPrimaryKeyCond(cs.originalEntity, meta.primaryKeys.concat(...meta.concurrencyCheckKeys));
+            const cond = Utils_1.Utils.getPrimaryKeyCond(cs.originalEntity, meta.primaryKeys.concat(...meta.concurrencyCheckKeys));
             if (meta.versionProperty) {
                 // @ts-ignore
                 cond[meta.versionProperty] = this.platform.quoteVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
@@ -268,7 +269,7 @@ class ChangeSetPersister {
         if (res.length !== changeSets.length) {
             const compare = (a, b, keys) => keys.every(k => a[k] === b[k]);
             const entity = changeSets.find(cs => {
-                return !res.some(row => compare(utils_1.Utils.getPrimaryKeyCond(cs.entity, primaryKeys), row, primaryKeys));
+                return !res.some(row => compare(Utils_1.Utils.getPrimaryKeyCond(cs.entity, primaryKeys), row, primaryKeys));
             }).entity;
             throw errors_1.OptimisticLockError.lockFailed(entity);
         }
@@ -288,14 +289,14 @@ class ChangeSetPersister {
             // do not reload things that already had a runtime value
             meta.props
                 .filter(prop => prop.persist !== false && (prop.autoincrement || prop.generated || prop.defaultRaw))
-                .filter(prop => (changeSets[0].entity[prop.name] == null && prop.defaultRaw !== 'null') || utils_1.Utils.isRawSql(changeSets[0].entity[prop.name]))
+                .filter(prop => (changeSets[0].entity[prop.name] == null && prop.defaultRaw !== 'null') || (0, RawQueryFragment_1.isRaw)(changeSets[0].entity[prop.name]))
                 .forEach(prop => reloadProps.push(prop));
         }
         if (changeSets[0].type === ChangeSet_1.ChangeSetType.UPDATE) {
             const returning = new Set();
             changeSets.forEach(cs => {
-                utils_1.Utils.keys(cs.payload).forEach(k => {
-                    if (utils_1.Utils.isRawSql(cs.payload[k]) && utils_1.Utils.isRawSql(cs.entity[k])) {
+                Utils_1.Utils.keys(cs.payload).forEach(k => {
+                    if ((0, RawQueryFragment_1.isRaw)(cs.payload[k]) && (0, RawQueryFragment_1.isRaw)(cs.entity[k])) {
                         returning.add(meta.properties[k]);
                     }
                 });
@@ -312,20 +313,20 @@ class ChangeSetPersister {
             return;
         }
         reloadProps.unshift(...meta.getPrimaryProps());
-        const pk = utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
+        const pk = Utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
         const pks = changeSets.map(cs => {
             const val = (0, entity_1.helper)(cs.entity).getPrimaryKey(true);
-            if (utils_1.Utils.isPlainObject(val)) {
-                return utils_1.Utils.getCompositeKeyValue(val, meta, false, this.platform);
+            if (Utils_1.Utils.isPlainObject(val)) {
+                return Utils_1.Utils.getCompositeKeyValue(val, meta, false, this.platform);
             }
             return val;
         });
         options = this.propagateSchemaFromMetadata(meta, options, {
-            fields: utils_1.Utils.unique(reloadProps.map(prop => prop.name)),
+            fields: Utils_1.Utils.unique(reloadProps.map(prop => prop.name)),
         });
         const data = await this.driver.find(meta.className, { [pk]: { $in: pks } }, options);
         const map = new Map();
-        data.forEach(item => map.set(utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
+        data.forEach(item => map.set(Utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
         for (const changeSet of changeSets) {
             const data = map.get((0, entity_1.helper)(changeSet.entity).getSerializedPrimaryKey());
             this.hydrator.hydrate(changeSet.entity, meta, data, this.factory, 'full', false, true);
@@ -346,10 +347,10 @@ class ChangeSetPersister {
         if (prop.name in changeSet.payload) {
             return;
         }
-        const values = utils_1.Utils.unwrapProperty(changeSet.payload, meta, prop, true); // for object embeddables
+        const values = Utils_1.Utils.unwrapProperty(changeSet.payload, meta, prop, true); // for object embeddables
         values.forEach(([value, indexes]) => {
             if (value instanceof entity_1.EntityIdentifier) {
-                utils_1.Utils.setPayloadProperty(changeSet.payload, meta, prop, value.getValue(), indexes);
+                Utils_1.Utils.setPayloadProperty(changeSet.payload, meta, prop, value.getValue(), indexes);
             }
         });
     }
@@ -359,7 +360,7 @@ class ChangeSetPersister {
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
     mapReturnedValues(entity, payload, row, meta, upsert = false) {
-        if ((!this.usesReturningStatement && !upsert) || !row || !utils_1.Utils.hasObjectKeys(row)) {
+        if ((!this.usesReturningStatement && !upsert) || !row || !Utils_1.Utils.hasObjectKeys(row)) {
             return;
         }
         const mapped = this.comparator.mapResult(meta.className, row);

package/unit-of-work/UnitOfWork.js

@@ -313,7 +313,7 @@ class UnitOfWork {
             if (runInTransaction) {
                 await this.em.getConnection('write').transactional(trx => this.persistToDatabase(groups, trx), {
                     ctx: oldTx,
-                    eventBroadcaster: new events_1.TransactionEventBroadcaster(this.em, this),
+                    eventBroadcaster: new events_1.TransactionEventBroadcaster(this.em),
                 });
             }
             else {

package/utils/AbstractSchemaGenerator.js

@@ -37,7 +37,9 @@ class AbstractSchemaGenerator {
             await this.ensureDatabase();
             await this.dropSchema();
         }
-        await this.createSchema(options);
+        if (options?.createSchema !== false) {
+            await this.createSchema(options);
+        }
     }
     async clearDatabase(options) {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {

package/utils/Configuration.d.ts

@@ -2,7 +2,7 @@ import type { NamingStrategy } from '../naming-strategy';
 import { FileCacheAdapter, type SyncCacheAdapter, type CacheAdapter } from '../cache';
 import type { EntityRepository } from '../entity/EntityRepository';
 import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } from '../typings';
-import { ObjectHydrator } from '../hydration';
+import { ObjectHydrator } from '../hydration/ObjectHydrator';
 import { NullHighlighter } from '../utils/NullHighlighter';
 import { type Logger, type LoggerNamespace, type LoggerOptions } from '../logging';
 import type { EntityManager } from '../EntityManager';
@@ -150,6 +150,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
     private readonly cache;
     private readonly extensions;
     constructor(options: Options, validate?: boolean);
+    getPlatform(): ReturnType<D['getPlatform']>;
     /**
      * Gets specific configuration option. Falls back to specified `defaultValue` if provided.
      */
@@ -167,7 +168,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
      * Gets Logger instance.
      */
     getLogger(): Logger;
-    getPlatform(): Platform;
+    getDataloaderType(): DataloaderType;
     /**
      * Gets current client URL (connection string).
      */
@@ -231,10 +232,6 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
  * Type helper to make it easier to use `mikro-orm.config.js`.
  */
 export declare function defineConfig<D extends IDatabaseDriver>(options: Options<D>): Options<D, D[typeof EntityManagerType] & EntityManager<IDatabaseDriver<import("..").Connection>>>;
-export interface DynamicPassword {
-    password: string;
-    expirationChecker?: () => boolean;
-}
 export interface ConnectionOptions {
     dbName?: string;
     schema?: string;
@@ -243,12 +240,13 @@ export interface ConnectionOptions {
     host?: string;
     port?: number;
     user?: string;
-    password?: string | (() => MaybePromise<string> | MaybePromise<DynamicPassword>);
+    password?: string | (() => MaybePromise<string>);
     charset?: string;
     collate?: string;
     multipleStatements?: boolean;
     pool?: PoolConfig;
     driverOptions?: Dictionary;
+    onCreateConnection?: (connection: unknown) => Promise<void>;
 }
 export type MigrationsOptions = {
     tableName?: string;
@@ -277,21 +275,9 @@ export interface SeederOptions {
     fileName?: (className: string) => string;
 }
 export interface PoolConfig {
-    name?: string;
-    afterCreate?: Function;
     min?: number;
     max?: number;
-    refreshIdle?: boolean;
     idleTimeoutMillis?: number;
-    reapIntervalMillis?: number;
-    returnToHead?: boolean;
-    priorityRange?: number;
-    log?: (message: string, logLevel: string) => void;
-    propagateCreateError?: boolean;
-    createRetryIntervalMillis?: number;
-    createTimeoutMillis?: number;
-    destroyTimeoutMillis?: number;
-    acquireTimeoutMillis?: number;
 }
 export interface MetadataDiscoveryOptions {
     warnWhenNoEntities?: boolean;
@@ -330,7 +316,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     connect: boolean;
     verbose: boolean;
     ignoreUndefinedInQuery?: boolean;
-    onQuery: (sql: string, params: unknown[]) => string;
+    onQuery: (sql: string, params: readonly unknown[]) => string;
     autoJoinOneToOneOwner: boolean;
     autoJoinRefsForFilters: boolean;
     propagationOnPrototype: boolean;

package/utils/Configuration.js

@@ -4,7 +4,7 @@ exports.Configuration = void 0;
 exports.defineConfig = defineConfig;
 const fs_extra_1 = require("fs-extra");
 const cache_1 = require("../cache");
-const hydration_1 = require("../hydration");
+const ObjectHydrator_1 = require("../hydration/ObjectHydrator");
 const NullHighlighter_1 = require("../utils/NullHighlighter");
 const logging_1 = require("../logging");
 const Utils_1 = require("../utils/Utils");
@@ -45,7 +45,7 @@ class Configuration {
         findOneOrFailHandler: (entityName, where) => errors_1.NotFoundError.findOneFailed(entityName, where),
         findExactlyOneOrFailHandler: (entityName, where) => errors_1.NotFoundError.findExactlyOneFailed(entityName, where),
         baseDir: process.cwd(),
-        hydrator: hydration_1.ObjectHydrator,
+        hydrator: ObjectHydrator_1.ObjectHydrator,
         flushMode: enums_1.FlushMode.AUTO,
         loadStrategy: enums_1.LoadStrategy.JOINED,
         dataloader: enums_1.DataloaderType.NONE,
@@ -167,6 +167,9 @@ class Configuration {
             this.init(validate);
         }
     }
+    getPlatform() {
+        return this.platform;
+    }
     /**
      * Gets specific configuration option. Falls back to specified `defaultValue` if provided.
      */
@@ -198,8 +201,11 @@ class Configuration {
     getLogger() {
         return this.logger;
     }
-    getPlatform() {
-        return this.platform;
+    getDataloaderType() {
+        if (typeof this.options.dataloader === 'boolean') {
+            return this.options.dataloader ? enums_1.DataloaderType.ALL : enums_1.DataloaderType.NONE;
+        }
+        return this.options.dataloader;
     }
     /**
      * Gets current client URL (connection string).
@@ -306,7 +312,7 @@ class Configuration {
             this.options.metadataCache.enabled = this.getMetadataProvider().useCache();
         }
         if (!this.options.clientUrl) {
-            this.options.clientUrl = this.driver.getConnection().getDefaultClientUrl();
+            this.options.clientUrl = this.platform.getDefaultClientUrl();
         }
         if (!('implicitTransactions' in this.options)) {
             this.options.implicitTransactions = this.platform.usesImplicitTransactions();

package/utils/ConfigurationLoader.js

@@ -225,14 +225,13 @@ class ConfigurationLoader {
         const ret = {};
         // only to keep some sort of back compatibility with those using env vars only, to support `MIKRO_ORM_TYPE`
         const PLATFORMS = {
-            'mongo': { className: 'MongoDriver', module: '@mikro-orm/mongodb' },
-            'mysql': { className: 'MySqlDriver', module: '@mikro-orm/mysql' },
-            'mssql': { className: 'MsSqlDriver', module: '@mikro-orm/mssql' },
-            'mariadb': { className: 'MariaDbDriver', module: '@mikro-orm/mariadb' },
-            'postgresql': { className: 'PostgreSqlDriver', module: '@mikro-orm/postgresql' },
-            'sqlite': { className: 'SqliteDriver', module: '@mikro-orm/sqlite' },
-            'better-sqlite': { className: 'BetterSqliteDriver', module: '@mikro-orm/better-sqlite' },
-            'libsql': { className: 'LibSqlDriver', module: '@mikro-orm/libsql' },
+            mongo: { className: 'MongoDriver', module: '@mikro-orm/mongodb' },
+            mysql: { className: 'MySqlDriver', module: '@mikro-orm/mysql' },
+            mssql: { className: 'MsSqlDriver', module: '@mikro-orm/mssql' },
+            mariadb: { className: 'MariaDbDriver', module: '@mikro-orm/mariadb' },
+            postgresql: { className: 'PostgreSqlDriver', module: '@mikro-orm/postgresql' },
+            sqlite: { className: 'SqliteDriver', module: '@mikro-orm/sqlite' },
+            libsql: { className: 'LibSqlDriver', module: '@mikro-orm/libsql' },
         };
         const array = (v) => v.split(',').map(vv => vv.trim());
         const bool = (v) => ['true', 't', '1'].includes(v.toLowerCase());

package/utils/DataloaderUtils.d.ts

@@ -2,7 +2,6 @@ import type { Primary, Ref } from '../typings';
 import { Collection, type InitCollectionOptions } from '../entity/Collection';
 import { type EntityManager } from '../EntityManager';
 import type DataLoader from 'dataloader';
-import { DataloaderType } from '../enums';
 import { type LoadReferenceOptions } from '../entity/Reference';
 export declare class DataloaderUtils {
     /**
@@ -39,5 +38,4 @@ export declare class DataloaderUtils {
      * makes one query per entity and maps each input collection to the corresponding result.
      */
     static getColBatchLoadFn(em: EntityManager): DataLoader.BatchLoadFn<[Collection<any>, Omit<InitCollectionOptions<any, any>, 'dataloader'>?], any>;
-    static getDataloaderType(dataloaderCfg: DataloaderType | boolean): DataloaderType;
 }

package/utils/DataloaderUtils.js

@@ -182,15 +182,5 @@ class DataloaderUtils {
             });
         };
     }
-    static getDataloaderType(dataloaderCfg) {
-        switch (dataloaderCfg) {
-            case true:
-                return enums_1.DataloaderType.ALL;
-            case false:
-                return enums_1.DataloaderType.NONE;
-            default:
-                return dataloaderCfg;
-        }
-    }
 }
 exports.DataloaderUtils = DataloaderUtils;

package/utils/QueryHelper.js

@@ -74,7 +74,7 @@ class QueryHelper {
         if (meta && root) {
             QueryHelper.inlinePrimaryKeyObjects(where, meta, metadata);
         }
-        if (options.platform.getConfig().get('ignoreUndefinedInQuery') && where && typeof where === 'object') {
+        if (platform.getConfig().get('ignoreUndefinedInQuery') && where && typeof where === 'object') {
             Utils_1.Utils.dropUndefinedProperties(where);
         }
         where = QueryHelper.processParams(where) ?? {};
@@ -112,15 +112,15 @@ class QueryHelper {
                 return o;
             }
             // wrap top level operators (except platform allowed operators) with PK
-            if (Utils_1.Utils.isOperator(key) && root && meta && !options.platform.isAllowedTopLevelOperator(key)) {
+            if (Utils_1.Utils.isOperator(key) && root && meta && !platform.isAllowedTopLevelOperator(key)) {
                 const rootPrimaryKey = Utils_1.Utils.getPrimaryKeyHash(meta.primaryKeys);
                 o[rootPrimaryKey] = { [key]: QueryHelper.processWhere({ ...options, where: value, root: false }) };
                 return o;
             }
-            if (prop?.customType && convertCustomTypes && !platform.isRaw(value)) {
+            if (prop?.customType && convertCustomTypes && !(0, RawQueryFragment_1.isRaw)(value)) {
                 value = QueryHelper.processCustomType(prop, value, platform, undefined, true);
             }
-            const isJsonProperty = prop?.customType instanceof JsonType_1.JsonType && Utils_1.Utils.isPlainObject(value) && !platform.isRaw(value) && Object.keys(value)[0] !== '$eq';
+            const isJsonProperty = prop?.customType instanceof JsonType_1.JsonType && Utils_1.Utils.isPlainObject(value) && !(0, RawQueryFragment_1.isRaw)(value) && Object.keys(value)[0] !== '$eq';
             if (isJsonProperty) {
                 return this.processJsonCondition(o, value, [prop.fieldNames[0]], platform, aliased);
             }
@@ -191,7 +191,7 @@ class QueryHelper {
         if (Array.isArray(cond) && !(key && Utils_1.Utils.isArrayOperator(key))) {
             return cond.map(v => QueryHelper.processCustomType(prop, v, platform, key, fromQuery));
         }
-        if (platform.isRaw(cond)) {
+        if ((0, RawQueryFragment_1.isRaw)(cond)) {
             return cond;
         }
         return prop.customType.convertToDatabaseValue(cond, platform, { fromQuery, key, mode: 'query' });

package/utils/RawQueryFragment.d.ts

@@ -30,6 +30,8 @@ export declare class RawQueryFragment {
         params?: undefined;
     };
 }
+export { RawQueryFragment as Raw };
+export declare function isRaw(value: unknown): value is RawQueryFragment;
 /** @internal */
 export declare const ALIAS_REPLACEMENT = "[::alias::]";
 /** @internal */

package/utils/RawQueryFragment.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.RawQueryFragment = void 0;
+exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.Raw = exports.RawQueryFragment = void 0;
+exports.isRaw = isRaw;
 exports.raw = raw;
 exports.sql = sql;
 exports.createSqlFunction = createSqlFunction;
@@ -102,9 +103,13 @@ class RawQueryFragment {
     }
 }
 exports.RawQueryFragment = RawQueryFragment;
+exports.Raw = RawQueryFragment;
 Object.defineProperties(RawQueryFragment.prototype, {
     __raw: { value: true, enumerable: false },
 });
+function isRaw(value) {
+    return typeof value === 'object' && value !== null && '__raw' in value;
+}
 /** @internal */
 exports.ALIAS_REPLACEMENT = '[::alias::]';
 /** @internal */
@@ -164,7 +169,8 @@ function raw(sql, params) {
         const pairs = Object.entries(params);
         const objectParams = [];
         for (const [key, value] of pairs) {
-            sql = sql.replace(':' + key, '?');
+            sql = sql.replace(`:${key}:`, '??');
+            sql = sql.replace(`:${key}`, '?');
             objectParams.push(value);
         }
         return new RawQueryFragment(sql, objectParams);

package/utils/Utils.d.ts

@@ -75,7 +75,7 @@ export declare class Utils {
     /**
      * Merges all sources into the target recursively. Ignores `undefined` values.
      */
-    static mergeConfig(target: any, ...sources: any[]): any;
+    static mergeConfig<T>(target: T, ...sources: Dictionary[]): T;
     /**
      * Merges all sources into the target recursively.
      */

package/utils/Utils.js

@@ -44,7 +44,7 @@ function compareObjects(a, b) {
     if (!a || !b || typeof a !== 'object' || typeof b !== 'object' || !compareConstructors(a, b)) {
         return false;
     }
-    if (isRawSql(a) && isRawSql(b)) {
+    if (a.__raw && b.__raw) {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return a.sql === b.sql && compareArrays(a.params, b.params);
     }