@mikro-orm/core 7.2.4-dev.0 → 7.2.4-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.4-dev.0",
+  "version": "7.2.4-dev.2",
   "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.",
   "keywords": [
     "data-mapper",

package/unit-of-work/ChangeSetPersister.js

@@ -196,10 +196,17 @@ export class ChangeSetPersister {
     }
     async persistManagedEntities(meta, changeSets, options) {
         const size = this.#config.get('batchSize');
-        for (let i = 0; i < changeSets.length; i += size) {
-            const chunk = changeSets.slice(i, i + size);
-            await this.persistManagedEntitiesBatch(meta, chunk, options);
-            await this.reloadVersionValues(meta, chunk, options);
+        // a batch checks the version in all rows or none, so references without a loaded version go separately
+        const hasVersion = (cs) => cs.entity[meta.versionProperty] != null;
+        const groups = meta.ownsVersionProperty()
+            ? [changeSets.filter(hasVersion), changeSets.filter(cs => !hasVersion(cs))]
+            : [changeSets];
+        for (const group of groups) {
+            for (let i = 0; i < group.length; i += size) {
+                const chunk = group.slice(i, i + size);
+                await this.persistManagedEntitiesBatch(meta, chunk, options);
+                await this.reloadVersionValues(meta, chunk, options);
+            }
         }
     }
     checkConcurrencyKeys(meta, changeSet, cond) {
@@ -223,9 +230,14 @@ export class ChangeSetPersister {
         });
         const cond = [];
         const payload = [];
+        // like in `updateEntity()`, but the batch needs the version in all rows or none
+        const versioned = meta.ownsVersionProperty() && changeSets.every(cs => cs.entity[meta.versionProperty] != null);
         for (const changeSet of changeSets) {
             const where = changeSet.getPrimaryKey(true);
             this.checkConcurrencyKeys(meta, changeSet, where);
+            if (versioned) {
+                where[meta.versionProperty] = this.#platform.convertVersionValue(changeSet.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
+            }
             cond.push(where);
             payload.push(changeSet.payload);
         }
@@ -235,6 +247,12 @@ export class ChangeSetPersister {
         // from those to be able to match them with `getSerializedPrimaryKey()` of the entity
         const pkFields = meta.getPrimaryProps().flatMap(prop => prop.fieldNames);
         res.rows?.forEach(item => map.set(Utils.getPrimaryKeyHash(pkFields.map(field => item[field])), item));
+        if ((meta.ownsVersionProperty() || meta.getOwnConcurrencyCheckKeys().length > 0) &&
+            res.affectedRows < changeSets.length) {
+            // without `returning`, the stale entity can't be identified, so we report the first one
+            const failed = changeSets.find(cs => !map.has(helper(cs.entity).getSerializedPrimaryKey())) ?? changeSets[0];
+            throw OptimisticLockError.lockFailed(failed.entity);
+        }
         for (const changeSet of changeSets) {
             if (res.rows) {
                 const row = map.get(helper(changeSet.entity).getSerializedPrimaryKey());

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.4-dev.0';
+    static #ORM_VERSION = '7.2.4-dev.2';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;