@mikro-orm/core 6.5.7-dev.16 → 6.5.7-dev.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/EntityManager.js +5 -2
  2. package/package.json +2 -2
package/EntityManager.js CHANGED
@@ -1188,7 +1188,9 @@ class EntityManager {
1188
1188
  options.schema ??= em._schema;
1189
1189
  options.validate ??= true;
1190
1190
  entityName = utils_1.Utils.className(entityName);
1191
- em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
1191
+ if (options.validate) {
1192
+ em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
1193
+ }
1192
1194
  let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
1193
1195
  if (entity && (0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__initialized && !options.refresh) {
1194
1196
  return entity;
@@ -1197,7 +1199,8 @@ class EntityManager {
1197
1199
  const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
1198
1200
  const dataIsEntity = utils_1.Utils.isEntity(data);
1199
1201
  if (options.keepIdentity && entity && dataIsEntity && entity !== data) {
1200
- em.entityFactory.mergeData(meta, entity, (0, entity_1.helper)(data).__originalEntityData, { initialized: true, merge: true, ...options });
1202
+ (0, entity_1.helper)(entity).__data = (0, entity_1.helper)(data).__data;
1203
+ (0, entity_1.helper)(entity).__originalEntityData = (0, entity_1.helper)(data).__originalEntityData;
1201
1204
  return entity;
1202
1205
  }
1203
1206
  entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mikro-orm/core",
3
- "version": "6.5.7-dev.16",
3
+ "version": "6.5.7-dev.17",
4
4
  "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.",
5
5
  "main": "index.js",
6
6
  "module": "index.mjs",
@@ -64,7 +64,7 @@
64
64
  "esprima": "4.0.1",
65
65
  "fs-extra": "11.3.2",
66
66
  "globby": "11.1.0",
67
- "mikro-orm": "6.5.7-dev.16",
67
+ "mikro-orm": "6.5.7-dev.17",
68
68
  "reflect-metadata": "0.2.2"
69
69
  }
70
70
  }