fix(core): respect disableContextResolution option when forking

This got broken with #4717. Closes #3338
mikro-orm · Oct 2, 2023 · 5964e52 · 5964e52
1 parent e79ff42
commit 5964e52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/EntityManager.ts b/packages/core/src/EntityManager.ts
@@ -1557,7 +1557,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
 
     fork.filters = { ...em.filters };
     fork.filterParams = Utils.copy(em.filterParams);
-    fork._schema = options.schema ?? em.schema;
+    fork._schema = options.schema ?? em._schema;
 
     if (!options.clear) {
       for (const entity of em.unitOfWork.getIdentityMap()) {

diff --git a/tests/EntityManager.mongo.test.ts b/tests/EntityManager.mongo.test.ts
@@ -457,10 +457,10 @@ describe('EntityManagerMongo', () => {
 
     const spy = jest.spyOn(EntityManager.prototype, 'getContext');
     const fork2 = orm.em.fork({ disableContextResolution: true });
-    expect(spy).toBeCalledTimes(3);
+    expect(spy).toBeCalledTimes(2);
 
     const fork3 = orm.em.fork({ disableContextResolution: false });
-    expect(spy).toBeCalledTimes(7);
+    expect(spy).toBeCalledTimes(5);
   });
 
   test('findOne with empty where will throw', async () => {