@mikro-orm/sql 7.2.4-dev.9 → 7.2.5-dev.0

package/AbstractSqlDriver.js

@@ -1011,16 +1011,23 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const meta = this.metadata.get(entityName);
         if (options.upsert) {
             if (meta.tptParent) {
+                // the parent table reports a single insertId per batch, the EM sends such rows one by one
+                if (where.filter(cond => Utils.isEmpty(cond)).length > 1) {
+                    throw new Error(`Cannot upsert more than one ${meta.className} row without a unique value in one batch`);
+                }
                 // TPT parent tables go first, the PK they provide is the conflict target of this table
-                await this.nativeUpdateMany(meta.tptParent.class, where, data, options);
+                const res = await this.nativeUpdateMany(meta.tptParent.class, where, data, options);
                 for (const [i, row] of data.entries()) {
                     if (meta.primaryKeys.some(pk => row[pk] == null)) {
-                        const found = await this.findOne(meta.tptParent.class, where[i], {
-                            fields: meta.primaryKeys,
-                            ctx: options.ctx,
-                            connectionType: 'write',
-                            schema: options.schema,
-                        });
+                        // a row without a condition cannot conflict, only the insert knows its PK
+                        const found = Utils.isEmpty(where[i])
+                            ? { [meta.primaryKeys[0]]: res.insertId }
+                            : await this.findOne(meta.tptParent.class, where[i], {
+                                fields: meta.primaryKeys,
+                                ctx: options.ctx,
+                                connectionType: 'write',
+                                schema: options.schema,
+                            });
                         meta.primaryKeys.forEach(pk => (row[pk] = found?.[pk]));
                     }
                 }
@@ -1040,7 +1047,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 data = data.map(row => Object.fromEntries(Object.entries(row).filter(([key]) => own(key))));
                 options.onConflictMergeFields = options.onConflictMergeFields?.filter(f => own(f));
                 options.onConflictExcludeFields = options.onConflictExcludeFields?.filter(f => own(f));
-                returning = [];
+                returning = this.getPrimaryKeyFields(meta);
             }
             qb.insert(data)
                 .onConflict(uniqueFields)
@@ -1056,7 +1063,12 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 qb.where(options.onConflictWhere);
             }
             const res = await this.rethrow(qb.execute('run', false));
-            return meta.inheritanceType === 'tpt' ? { ...res, row: undefined, rows: [] } : res;
+            if (meta.inheritanceType === 'tpt') {
+                // child tables do not generate the PK, so every table of the hierarchy reports the one of its first row
+                const insertId = data[0][meta.primaryKeys[0]] ?? res.insertId ?? res.row?.[returning[0]];
+                return { ...res, insertId, row: undefined, rows: [] };
+            }
+            return res;
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(meta, d)) : [];
         const keys = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.4-dev.9",
+  "version": "7.2.5-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.6"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.2.3"
+    "@mikro-orm/core": "^7.2.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.4-dev.9"
+    "@mikro-orm/core": "7.2.5-dev.0"
   },
   "engines": {
     "node": ">= 22.17.0"