@mikro-orm/knex 5.7.8-dev.4 → 5.7.9-dev.0

package/AbstractSqlDriver.js

@@ -336,7 +336,8 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 /* istanbul ignore next */
                 qb.insert(data)
                     .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
-                    .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)));
+                    .merge(Object.keys(data).filter(f => !uniqueFields.includes(f)))
+                    .returning(meta?.hydrateProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
             }
             else {
                 qb.update(data).where(where);
@@ -356,8 +357,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const uniqueFields = core_1.Utils.isPlainObject(where[0]) ? Object.keys(where[0]) : meta.primaryKeys;
             const qb = this.createQueryBuilder(entityName, options.ctx, 'write', options.convertCustomTypes).withSchema(this.getSchemaName(meta, options));
             qb.insert(data)
-                .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
-                .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)));
+                .onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
+                .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
+                .returning(meta.hydrateProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
             return qb.execute('run', false);
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.7.8-dev.4",
+  "version": "5.7.9-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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -63,12 +63,12 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.7.7"
+    "@mikro-orm/core": "^5.7.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.7.8-dev.4",
-    "@mikro-orm/entity-generator": "~5.7.8-dev.4",
-    "@mikro-orm/migrations": "~5.7.8-dev.4",
+    "@mikro-orm/core": "~5.7.9-dev.0",
+    "@mikro-orm/entity-generator": "~5.7.9-dev.0",
+    "@mikro-orm/migrations": "~5.7.9-dev.0",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",