fix(core): merge only objects in assign() with mergeObjects flag

mikro-orm · Apr 6, 2019 · 749ca6f · 749ca6f
1 parent 48f001c
commit 749ca6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/entity/EntityAssigner.ts b/lib/entity/EntityAssigner.ts
@@ -36,7 +36,7 @@ export class EntityAssigner {
         return entity[prop as keyof T] = entity.__em.getValidator().validateProperty(props[prop], value, entity);
       }
 
-      if (options.mergeObjects) {
+      if (options.mergeObjects && Utils.isObject(value)) {
         Utils.merge(entity[prop as keyof T], value);
       } else {
         entity[prop as keyof T] = value;

diff --git a/tests/EntityHelper.mysql.test.ts b/tests/EntityHelper.mysql.test.ts
@@ -66,6 +66,9 @@ describe('EntityHelperMySql', () => {
     expect(book.meta).toEqual({ items: 3, category: 'bar' });
     book.assign({ meta: { category: 'bar' } });
     expect(book.meta).toEqual({ category: 'bar' });
+    jon.identities = ['1', '2'];
+    jon.assign({ identities: ['3', '4'] }, { mergeObjects: true });
+    expect(jon.identities).toEqual(['3', '4']);
   });
 
   afterAll(async () => orm.close(true));