@mikro-orm/knex 6.3.4-dev.12 → 6.3.4-dev.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.4-dev.12",
+  "version": "6.3.4-dev.13",
   "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",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.3.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.4-dev.12",
+    "@mikro-orm/core": "6.3.4-dev.13",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilderHelper.js

@@ -468,9 +468,21 @@ class QueryBuilderHelper {
         }
         const replacement = this.getOperatorReplacement(op, value);
         const fields = core_1.Utils.splitPrimaryKeys(key);
-        if (fields.length > 1 && Array.isArray(value[op]) && !value[op].every((v) => Array.isArray(v))) {
-            const tmp = value[op].length === 1 && core_1.Utils.isPlainObject(value[op][0]) ? fields.map(f => value[op][0][f]) : value[op];
-            value[op] = this.knex.raw(`(${fields.map(() => '?').join(', ')})`, tmp);
+        if (fields.length > 1 && Array.isArray(value[op])) {
+            const singleTuple = !value[op].every((v) => Array.isArray(v));
+            if (!this.platform.allowsComparingTuples()) {
+                if (op === '$in') {
+                    const conds = value[op].map(() => {
+                        return `(${fields.map(field => `${this.platform.quoteIdentifier(field)} = ?`).join(' and ')})`;
+                    });
+                    return void qb[m](this.knex.raw(`(${conds.join(' or ')})`, core_1.Utils.flatten(value[op])));
+                }
+                return void qb[m](this.knex.raw(`${fields.map(field => `${this.platform.quoteIdentifier(field)} = ?`).join(' and ')}`, core_1.Utils.flatten(value[op])));
+            }
+            if (singleTuple) {
+                const tmp = value[op].length === 1 && core_1.Utils.isPlainObject(value[op][0]) ? fields.map(f => value[op][0][f]) : value[op];
+                value[op] = this.knex.raw(`(${fields.map(() => '?').join(', ')})`, tmp);
+            }
         }
         if (value[op] instanceof core_1.RawQueryFragment) {
             value[op] = this.knex.raw(value[op].sql, value[op].params);