@mikro-orm/sql 7.1.14-dev.9 → 7.1.15-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.14-dev.9",
+  "version": "7.1.15-dev.0",
   "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",
@@ -50,10 +50,10 @@
     "kysely": "0.29.5"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.13"
+    "@mikro-orm/core": "^7.1.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.14-dev.9"
+    "@mikro-orm/core": "7.1.15-dev.0"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilderHelper.js

@@ -533,6 +533,11 @@ export class QueryBuilderHelper {
         const replacement = this.getOperatorReplacement(op, value);
         const rawField = Raw.isKnownFragmentSymbol(key);
         const fields = rawField ? [key] : Utils.splitPrimaryKeys(key);
+        // a raw key's arity is opaque, so the row-value form is detected from the payload instead
+        const rowValues = rawField &&
+            ['$in', '$nin'].includes(op) &&
+            Array.isArray(value[op]) &&
+            value[op].every((v) => Array.isArray(v));
         if (fields.length > 1 && Array.isArray(value[op])) {
             const singleTuple = !value[op].every((v) => Array.isArray(v));
             if (!this.#platform.allowsComparingTuples()) {
@@ -601,15 +606,15 @@ export class QueryBuilderHelper {
             }
             else {
                 const mappedKey = this.mapper(key, type, opValue, null);
-                const val = this.getValueReplacement(fields, opValue, params, op, prop);
+                const val = this.getValueReplacement(fields, opValue, params, op, prop, rowValues);
                 parts.push(`${this.#platform.quoteIdentifier(mappedKey)} ${replacement} ${val}`);
             }
         }
         return { sql: parts.join(' and '), params };
     }
-    getValueReplacement(fields, value, params, key, prop) {
+    getValueReplacement(fields, value, params, key, prop, rowValues = false) {
         if (Array.isArray(value)) {
-            if (fields.length > 1) {
+            if (fields.length > 1 || rowValues) {
                 const tmp = [];
                 for (const field of value) {
                     tmp.push(`(${field.map(() => '?').join(', ')})`);