@mikro-orm/knex 6.0.0-dev.284 → 6.0.0-dev.286

package/AbstractSqlDriver.js

@@ -237,7 +237,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             for (const prop of targetProps) {
                 if (prop.fieldNames.length > 1) { // composite keys
                     const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
-                    relationPojo[prop.name] = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop);
+                    const pk = core_1.Utils.mapFlatCompositePrimaryKey(fk, prop);
+                    relationPojo[prop.name] = pk.every(val => val != null) ? pk : null;
                 }
                 else if (prop.runtimeType === 'Date') {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
@@ -623,17 +624,20 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                         const kqb = qb.delete({ [coll.property.mappedBy]: pks })
                             .getKnexQuery()
                             .whereNotIn(cols, insertDiff);
-                        return this.rethrow(this.execute(kqb));
+                        await this.rethrow(this.execute(kqb));
+                        continue;
                     }
                     const kqb = qb.update({ [coll.property.mappedBy]: null })
                         .getKnexQuery()
                         .whereNotIn(cols, insertDiff);
-                    return this.rethrow(this.execute(kqb));
+                    await this.rethrow(this.execute(kqb));
+                    continue;
                 }
                 const kqb = qb.update({ [coll.property.mappedBy]: pks })
                     .getKnexQuery()
                     .whereIn(cols, insertDiff);
-                return this.rethrow(this.execute(kqb));
+                await this.rethrow(this.execute(kqb));
+                continue;
             }
             /* istanbul ignore next */
             const pivotMeta = this.metadata.find(coll.property.pivotEntity);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.284",
+  "version": "6.0.0-dev.286",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^5.0.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.284"
+    "@mikro-orm/core": "6.0.0-dev.286"
   }
 }