fix(core): respect global schema option in first level cache

mikro-orm · Nov 25, 2023 · 1833455 · 1833455
1 parent 90ec766
commit 1833455
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/packages/core/src/unit-of-work/UnitOfWork.ts b/packages/core/src/unit-of-work/UnitOfWork.ts
@@ -172,7 +172,7 @@ export class UnitOfWork {
       hash = Utils.getPrimaryKeyHash(keys);
     }
 
-    schema ??= meta.schema;
+    schema ??= meta.schema ?? this.em.config.get('schema');
 
     if (schema) {
       hash = `${schema}:${hash}`;

diff --git a/tests/features/multiple-schemas/reloading-entity.postgres.test.ts b/tests/features/multiple-schemas/reloading-entity.postgres.test.ts
@@ -1,4 +1,14 @@
-import { Collection, Entity, Ref, ManyToOne, MikroORM, OneToMany, PrimaryKey, Reference } from '@mikro-orm/core';
+import {
+  Collection,
+  Entity,
+  Ref,
+  ManyToOne,
+  MikroORM,
+  OneToMany,
+  PrimaryKey,
+  Reference,
+  Property,
+} from '@mikro-orm/core';
 import { PostgreSqlDriver } from '@mikro-orm/postgresql';
 
 @Entity()
@@ -7,6 +17,9 @@ export class Customer {
   @PrimaryKey()
   id!: number;
 
+  @Property()
+  name!: string;
+
   @OneToMany({ entity: 'License', mappedBy: 'customer' })
   licenses = new Collection<License>(this);
 
@@ -43,14 +56,21 @@ afterAll(() => orm.close(true));
 
 test('entity is retrieved from identity map', async () => {
   const customer = new Customer();
+  customer.name = 'foo';
   await orm.em.persistAndFlush(customer);
   expect(orm.em.getUnitOfWork().getIdentityMap().keys()).toEqual(['Customer-myschema:1']);
 
   const check1 = await orm.em.findOneOrFail(Customer, customer.id);
   expect(orm.em.getUnitOfWork().getIdentityMap().keys()).toEqual(['Customer-myschema:1']);
   expect(check1).toBe(customer);
+  expect(check1.name).toBe('foo');
 
-  const check2 = await orm.em.findOneOrFail(Customer, customer.id, { refresh: true });
+  // simulate change in the database from outside
+  await orm.em.nativeUpdate(Customer, { id: customer.id }, { name: 'bar' });
+  const check2 = await orm.em.findOneOrFail(Customer, customer.id, {
+    refresh: true, // will force reloading the values from database
+  });
+  expect(check2.name).toBe('bar');
   expect(orm.em.getUnitOfWork().getIdentityMap().keys()).toEqual(['Customer-myschema:1']);
   expect(check2).toBe(customer);
 });