@mikro-orm/core 7.2.2-dev.14 → 7.2.2-dev.16

package/EntityManager.d.ts

@@ -580,6 +580,11 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * Checks whether this EntityManager is currently operating inside a database transaction.
      */
     isInTransaction(): boolean;
+    /**
+     * Checks whether transactions are disabled for this EntityManager.
+     * @internal
+     */
+    isTransactionDisabled(): boolean;
     /**
      * Gets the transaction context (driver dependent object used to make sure queries are executed on same connection).
      */
@@ -633,7 +638,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * @internal
      */
-    tryCache<T extends object, R>(entityName: EntityName<T>, config: boolean | number | [string, number] | undefined, key: unknown, refresh?: boolean, merge?: boolean): Promise<{
+    tryCache<T extends object, R>(entityName: EntityName<T>, config: boolean | number | [string, number] | undefined, key: unknown, refresh?: boolean, merge?: boolean, schema?: string): Promise<{
         data?: R | null;
         key: string;
     } | undefined>;

package/EntityManager.js

@@ -133,7 +133,7 @@ export class EntityManager {
         options.populate = (await em.preparePopulate(entityName, options));
         const populate = options.populate;
         const cacheKey = em.cacheKey(entityName, options, 'em.find', where);
-        const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
+        const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true, options.schema);
         if (cached?.data) {
             await em.#entityLoader.populate(entityName, cached.data, populate, {
                 ...options,
@@ -834,7 +834,7 @@ export class EntityManager {
         validateParams(where);
         options.populate = (await em.preparePopulate(entityName, options));
         const cacheKey = em.cacheKey(entityName, options, 'em.findOne', where);
-        const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
+        const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true, options.schema);
         if (cached?.data !== undefined) {
             if (cached.data) {
                 await em.#entityLoader.populate(entityName, [cached.data], options.populate, {
@@ -1985,6 +1985,13 @@ export class EntityManager {
     isInTransaction() {
         return !!this.getContext(false).#transactionContext;
     }
+    /**
+     * Checks whether transactions are disabled for this EntityManager.
+     * @internal
+     */
+    isTransactionDisabled() {
+        return !!this.getContext(false).#disableTransactions;
+    }
     /**
      * Gets the transaction context (driver dependent object used to make sure queries are executed on same connection).
      */
@@ -2340,7 +2347,7 @@ export class EntityManager {
     /**
      * @internal
      */
-    async tryCache(entityName, config, key, refresh, merge) {
+    async tryCache(entityName, config, key, refresh, merge, schema) {
         config ??= this.config.get('resultCache').global;
         if (!config) {
             return undefined;
@@ -2362,6 +2369,7 @@ export class EntityManager {
             merge: true,
             convertCustomTypes: false,
             refresh,
+            schema,
             recomputeSnapshot: true,
         };
         if (Array.isArray(cached) && merge) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.2-dev.14",
+  "version": "7.2.2-dev.16",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/unit-of-work/UnitOfWork.js

@@ -467,7 +467,10 @@ export class UnitOfWork {
             }
             const groups = this.getChangeSetGroups();
             const platform = this.#em.getPlatform();
-            const runInTransaction = !this.#em.isInTransaction() && platform.supportsTransactions() && this.#em.config.get('implicitTransactions');
+            const runInTransaction = !this.#em.isInTransaction() &&
+                !this.#em.isTransactionDisabled() &&
+                platform.supportsTransactions() &&
+                this.#em.config.get('implicitTransactions');
             if (runInTransaction) {
                 const loggerContext = Utils.merge({ id: this.#em._id }, this.#em.getLoggerContext({ disableContextResolution: true }));
                 await this.#em.getConnection('write').transactional(trx => this.persistToDatabase(groups, trx), {

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.2-dev.14';
+    static #ORM_VERSION = '7.2.2-dev.16';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;