@mikro-orm/core 6.3.12 → 6.3.13-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.12",
+  "version": "6.3.13-dev.1",
   "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.3.12",
+    "mikro-orm": "6.3.13-dev.1",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -90,8 +90,8 @@ export type Scalar = boolean | number | string | bigint | symbol | Date | RegExp
 };
 export type ExpandScalar<T> = null | (T extends string ? T | RegExp : T extends Date ? Date | string : T extends bigint ? bigint | string | number : T);
 export type OperatorMap<T> = {
-    $and?: readonly ExpandQuery<T>[];
-    $or?: readonly ExpandQuery<T>[];
+    $and?: ExpandQuery<T>[];
+    $or?: ExpandQuery<T>[];
     $eq?: ExpandScalar<T> | readonly ExpandScalar<T>[];
     $ne?: ExpandScalar<T>;
     $in?: readonly ExpandScalar<T>[];

package/unit-of-work/ChangeSetPersister.js

@@ -180,14 +180,20 @@ class ChangeSetPersister {
             convertCustomTypes: false,
             processCollections: false,
         });
-        const cond = changeSets.map(cs => cs.getPrimaryKey(true));
-        changeSets.forEach((changeSet, idx) => {
-            this.checkConcurrencyKeys(meta, changeSet, cond[idx]);
-        });
-        const res = await this.driver.nativeUpdateMany(meta.className, cond, changeSets.map(cs => cs.payload), options);
+        const cond = [];
+        const payload = [];
+        for (const changeSet of changeSets) {
+            const where = changeSet.getPrimaryKey(true);
+            this.checkConcurrencyKeys(meta, changeSet, where);
+            cond.push(where);
+            payload.push(changeSet.payload);
+        }
+        const res = await this.driver.nativeUpdateMany(meta.className, cond, payload, options);
+        const map = new Map();
+        res.rows?.forEach(item => map.set(utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
         for (const changeSet of changeSets) {
             if (res.rows) {
-                const row = res.rows.find(row => utils_1.Utils.equals(utils_1.Utils.extractPK(row, meta), changeSet.getPrimaryKey()));
+                const row = map.get((0, entity_1.helper)(changeSet.entity).getSerializedPrimaryKey());
                 this.mapReturnedValues(changeSet.entity, changeSet.payload, row, meta);
             }
             changeSet.persisted = true;

package/utils/Utils.js

@@ -49,9 +49,11 @@ function compareObjects(a, b) {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return a.sql === b.sql && compareArrays(a.params, b.params);
     }
+    if ((a instanceof Date && b instanceof Date)) {
+        return a.toISOString() === b.toISOString();
+    }
     if ((typeof a === 'function' && typeof b === 'function') ||
         (typeof a === 'object' && a.client && ['Ref', 'Raw'].includes(a.constructor.name) && typeof b === 'object' && b.client && ['Ref', 'Raw'].includes(b.constructor.name)) || // knex qb
-        (a instanceof Date && b instanceof Date) ||
         (a instanceof RegExp && b instanceof RegExp) ||
         (a instanceof String && b instanceof String) ||
         (a instanceof Number && b instanceof Number)) {