@mikro-orm/knex 6.0.0-dev.19 → 6.0.0-dev.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.19",
+  "version": "6.0.0-dev.20",
   "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",
@@ -59,13 +59,13 @@
   },
   "dependencies": {
     "fs-extra": "11.1.0",
-    "knex": "2.3.0",
+    "knex": "2.4.0",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.6.3"
+    "@mikro-orm/core": "^5.6.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.19"
+    "@mikro-orm/core": "~6.0.0-dev.20"
   }
 }

package/query/QueryBuilderHelper.js

@@ -36,6 +36,17 @@ class QueryBuilderHelper {
                     parts.push(this.mapper(a !== this.alias ? `${a}.${f}` : f, type, value, alias));
                 }
             }
+            // flatten the value if we see we are expanding nested composite key
+            // hackish, but cleaner solution would require quite a lot of refactoring
+            if (fields.length !== parts.length && Array.isArray(value)) {
+                value.forEach(row => {
+                    if (Array.isArray(row)) {
+                        const tmp = core_1.Utils.flatten(row);
+                        row.length = 0;
+                        row.push(...tmp);
+                    }
+                });
+            }
             return this.knex.raw('(' + parts.map(part => this.knex.ref(part)).join(', ') + ')');
         }
         let ret = field;
@@ -72,7 +83,8 @@ class QueryBuilderHelper {
             ret += ' as ' + alias;
         }
         if (customExpression) {
-            return this.knex.raw(ret, value);
+            const bindings = core_1.Utils.asArray(value).slice(0, ret.match(/\?/g)?.length ?? 0);
+            return this.knex.raw(ret, bindings);
         }
         if (!isTableNameAliasRequired || this.isPrefixed(ret) || noPrefix) {
             return ret;
@@ -394,7 +406,8 @@ class QueryBuilderHelper {
             }));
         }
         else {
-            qb[m](this.mapper(key, type, undefined, null), replacement, value[op]);
+            const mappedKey = this.mapper(key, type, value[op], null);
+            qb[m](mappedKey, replacement, value[op]);
         }
     }
     getOperatorReplacement(op, value) {