@mikro-orm/knex 6.6.18-dev.1 → 6.6.18-dev.3

package/AbstractSqlDriver.js

@@ -670,7 +670,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         sql = sql.substring(0, sql.length - 2) + ' where ';
         const pkProps = meta.primaryKeys.concat(...meta.concurrencyCheckKeys);
         const pks = core_1.Utils.flatten(pkProps.map(pk => meta.properties[pk].fieldNames));
-        sql += pks.length > 1 ? `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)}`).join(', ')})` : this.platform.quoteIdentifier(pks[0]);
+        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 => {
             if (core_1.Utils.isPlainObject(cond) && core_1.Utils.getObjectKeysSize(cond) === 1) {
                 cond = Object.values(cond)[0];
@@ -684,12 +687,18 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                         params.push(cond[pk]);
                     }
                 });
-                return `(${Array.from({ length: pks.length }).fill('?').join(', ')})`;
+                return condTemplate;
             }
             params.push(cond);
             return '?';
         });
-        sql += ` in (${conds.join(', ')})`;
+        if (useTupleIn) {
+            sql += pks.length > 1 ? `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)}`).join(', ')})` : this.platform.quoteIdentifier(pks[0]);
+            sql += ` in (${conds.join(', ')})`;
+        }
+        else {
+            sql += conds.join(' or ');
+        }
         if (this.platform.usesReturningStatement() && returning.size > 0) {
             const returningFields = core_1.Utils.flatten([...returning].map(prop => meta.properties[prop].fieldNames));
             /* istanbul ignore next */
@@ -842,7 +851,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             map[key] = [];
         }
         for (const item of res) {
-            const key = core_1.Utils.getPrimaryKeyHash(core_1.Utils.asArray(item[pivotProp2.name]));
+            const fk = item[pivotProp2.name];
+            // the owner PKs are always flat, while the pivot FK follows the owner PK structure,
+            // so a PK built from a relation to another composite PK entity needs flattening too
+            const pks = fk != null ? core_1.Utils.getOrderedPrimaryKeys(fk, ownerMeta) : core_1.Utils.asArray(fk);
+            const key = core_1.Utils.getPrimaryKeyHash(pks);
             map[key].push(item[pivotProp1.name]);
         }
         return map;
@@ -917,8 +930,24 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const [propName, ref] = hint.field.split(':', 2);
             return { propName, ref, children: hint.children };
         });
+        // with `fixedOrder` the pivot PK is the order column, which is not guaranteed to be unique when the
+        // pivot table is managed externally, so we disambiguate the rows by their FKs on top of the PK
+        const pivotRelations = meta.pivotTable && !meta.compositePK
+            ? meta.relations.filter(p => p.kind === core_1.ReferenceKind.MANY_TO_ONE && p.persist !== false)
+            : [];
         for (const item of rawResults) {
-            const pk = core_1.Utils.getCompositeKeyHash(item, meta);
+            // flat hash, so nested composite PK values keep their own separators and cannot collide
+            let pk = core_1.Utils.getCompositeKeyHash(item, meta, false, undefined, true);
+            if (pivotRelations.length > 0) {
+                pk = core_1.Utils.getPrimaryKeyHash([
+                    pk,
+                    ...pivotRelations.flatMap(p => {
+                        const value = item[p.name];
+                        // composite FKs are mapped to an array of values, which `extractPK` does not accept
+                        return (Array.isArray(value) ? core_1.Utils.flatten(value, true) : core_1.Utils.extractPK(value, p.targetMeta));
+                    }),
+                ]);
+            }
             if (map[pk]) {
                 for (const { propName } of hints) {
                     if (!item[propName]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.6.18-dev.1",
+  "version": "6.6.18-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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.6.17"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.18-dev.1",
+    "@mikro-orm/core": "6.6.18-dev.3",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"