@mikro-orm/knex 6.2.3-dev.3 → 6.2.3-dev.5

package/AbstractSqlDriver.js

@@ -454,7 +454,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     .onConflict(uniqueFields)
                     .returning(returning);
                 if (!options.onConflictAction || options.onConflictAction === 'merge') {
-                    const fields = (0, core_1.getOnConflictFields)(data, uniqueFields, options);
+                    const fields = (0, core_1.getOnConflictFields)(meta, data, uniqueFields, options);
                     qb.merge(fields);
                 }
                 if (options.onConflictAction === 'ignore') {
@@ -489,7 +489,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 .onConflict(uniqueFields)
                 .returning(returning);
             if (!options.onConflictAction || options.onConflictAction === 'merge') {
-                const fields = (0, core_1.getOnConflictFields)(data[0], uniqueFields, options);
+                const fields = (0, core_1.getOnConflictFields)(meta, data[0], uniqueFields, options);
                 qb.merge(fields);
             }
             if (options.onConflictAction === 'ignore') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.3-dev.3",
+  "version": "6.2.3-dev.5",
   "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": "^6.2.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.3-dev.3"
+    "@mikro-orm/core": "6.2.3-dev.5"
   }
 }

package/query/QueryBuilder.js

@@ -1255,6 +1255,10 @@ class QueryBuilder {
         subSubQuery.__raw = true; // tag it as there is now way to check via `instanceof`
         this._limit = undefined;
         this._offset = undefined;
+        if (this._fields.some(f => core_1.RawQueryFragment.isKnownFragment(f))) {
+            this.select(this._fields).where({ [core_1.Utils.getPrimaryKeyHash(meta.primaryKeys)]: { $in: subSubQuery } });
+            return;
+        }
         // remove joins that are not used for population or ordering to improve performance
         const populate = new Set();
         const orderByAliases = this._orderBy