fix(core): fix extra updates with select-in strategy and composite FKs

mikro-orm · Dec 20, 2023 · c848f8c · c848f8c
1 parent cf7cee1
commit c848f8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/core/src/entity/EntityHelper.ts b/packages/core/src/entity/EntityHelper.ts
@@ -154,7 +154,7 @@ export class EntityHelper {
 
         // 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 as string] = helper(wrapped.__data[prop.name]).getPrimaryKey(true);
+          wrapped.__originalEntityData[prop.name as string] = Utils.getPrimaryKeyValues(wrapped.__data[prop.name], prop.targetMeta!.primaryKeys, true);
         } else {
           wrapped.__touched = !hydrator.isRunning();
         }

diff --git a/packages/core/src/typings.ts b/packages/core/src/typings.ts
@@ -448,7 +448,7 @@ export class EntityMetadata<T = any> {
 
             // 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 as string] = val.__helper.getPrimaryKey(true);
+              wrapped.__originalEntityData[prop.name] = Utils.getPrimaryKeyValues(val, prop.targetMeta!.primaryKeys, true);
             } else {
               wrapped.__touched = !hydrator.isRunning();
             }

diff --git a/tests/issues/GHx9.test.ts b/tests/issues/GHx9.test.ts
@@ -80,23 +80,22 @@ afterAll(async () => {
   await orm.close();
 });
 
-test('extra updates with 1:1 relations (joined)', async () => {
+test('extra updates with 1:1 relations (select-in)', async () => {
   const result = await orm.em.findOneOrFail(Project, { id: project.id, organization: org.id }, {
     populate: ['projectUpdate'],
-    strategy: LoadStrategy.JOINED,
+    strategy: LoadStrategy.SELECT_IN,
   });
 
   expect(wrap(result.projectUpdate!.$).isTouched()).toBe(false);
   expect(wrap(result).isTouched()).toBe(false);
 
-  orm.em.getUnitOfWork().computeChangeSets();
   expect(orm.em.getUnitOfWork().getChangeSets()).toHaveLength(0);
 });
 
-test('extra updates with 1:1 relations (select-in)', async () => {
+test('extra updates with 1:1 relations (joined)', async () => {
   const result = await orm.em.findOneOrFail(Project, { id: project.id, organization: org.id }, {
     populate: ['projectUpdate'],
-    strategy: LoadStrategy.SELECT_IN,
+    strategy: LoadStrategy.JOINED,
   });
 
   expect(wrap(result.projectUpdate!.$).isTouched()).toBe(false);