@mikro-orm/sql 7.2.4-dev.1 → 7.2.4-dev.3

package/AbstractSqlDriver.js

@@ -1143,26 +1143,32 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         sql += ' where ';
         const pkProps = meta.primaryKeys.concat(...meta.getOwnConcurrencyCheckKeys());
+        // an optimistically locked batch carries the version in every condition
+        if (meta.versionProperty &&
+            where.every(cond => Utils.isPlainObject(cond) && meta.versionProperty in cond)) {
+            pkProps.push(meta.versionProperty);
+        }
         const pks = Utils.flatten(pkProps.map(pk => meta.properties[pk].fieldNames));
         const useTupleIn = pks.length <= 1 || this.platform.allowsComparingTuples();
         const condTemplate = useTupleIn
             ? `(${pks.map(() => '?').join(', ')})`
             : `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)} = ?`).join(' and ')})`;
-        const conds = where.map(cond => {
+        const conds = where.flatMap(cond => {
             // with multiple PK columns the condition is looked up by property name, so it needs to stay an object
             if (pks.length === 1 && Utils.isPlainObject(cond) && Utils.getObjectKeysSize(cond) === 1) {
                 cond = Object.values(cond)[0];
             }
             if (pks.length > 1) {
-                pkProps.forEach(pk => {
-                    if (Array.isArray(cond[pk])) {
-                        params.push(...Utils.flatten(cond[pk]));
-                    }
-                    else {
-                        params.push(cond[pk]);
-                    }
+                // a date version in sqlite matches either of its storage formats (see `convertVersionValue()`)
+                const version = cond[meta.versionProperty];
+                const versions = version?.$in ?? [version];
+                return versions.map(v => {
+                    pkProps.forEach(pk => {
+                        const value = pk === meta.versionProperty ? v : cond[pk];
+                        params.push(...(Array.isArray(value) ? Utils.flatten(value) : [value]));
+                    });
+                    return condTemplate;
                 });
-                return condTemplate;
             }
             params.push(cond);
             return '?';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.4-dev.1",
+  "version": "7.2.4-dev.3",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.2.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.4-dev.1"
+    "@mikro-orm/core": "7.2.4-dev.3"
   },
   "engines": {
     "node": ">= 22.17.0"