@mikro-orm/core 6.4.1-dev.2 → 6.4.1-dev.4

package/EntityManager.js

@@ -674,7 +674,6 @@ class EntityManager {
             refresh: true,
             initialized: true,
             schema: options.schema,
-            convertCustomTypes: true,
         });
         const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = (0, utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
@@ -838,7 +837,6 @@ class EntityManager {
                 refresh: true,
                 initialized: true,
                 schema: options.schema,
-                convertCustomTypes: true,
             });
             if (!(0, entity_1.helper)(entity).hasPrimaryKey()) {
                 loadPK.set(entity, allWhere[i]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.1-dev.2",
+  "version": "6.4.1-dev.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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.1-dev.2",
+    "mikro-orm": "6.4.1-dev.4",
     "reflect-metadata": "0.2.2"
   }
 }

package/unit-of-work/ChangeSetPersister.js

@@ -359,13 +359,21 @@ class ChangeSetPersister {
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
     mapReturnedValues(entity, payload, row, meta, upsert = false) {
-        if ((this.usesReturningStatement || upsert) && row && utils_1.Utils.hasObjectKeys(row)) {
-            const mapped = this.comparator.mapResult(meta.className, row);
-            if (entity) {
-                this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
+        if ((!this.usesReturningStatement && !upsert) || !row || !utils_1.Utils.hasObjectKeys(row)) {
+            return;
+        }
+        const mapped = this.comparator.mapResult(meta.className, row);
+        if (entity) {
+            this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
+        }
+        if (upsert) {
+            for (const prop of meta.props) {
+                if (prop.customType && prop.name in mapped) {
+                    mapped[prop.name] = prop.customType.convertToJSValue(mapped[prop.name], this.platform);
+                }
             }
-            Object.assign(payload, mapped); // merge to the changeset payload, so it gets saved to the entity snapshot
         }
+        Object.assign(payload, mapped);
     }
 }
 exports.ChangeSetPersister = ChangeSetPersister;