@mikro-orm/knex 5.8.10-dev.4 → 5.8.10-dev.5

package/AbstractSqlDriver.js

@@ -543,7 +543,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 join.schema = options.schema;
             });
         }
-        const items = owners.length ? await this.rethrow(qb.execute('all')) : [];
+        const items = owners.length ? await this.rethrow(qb.execute('all', { mergeResults: false })) : [];
         const map = {};
         const pkProps = ownerMeta.getPrimaryProps();
         owners.forEach(owner => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.8.10-dev.4",
+  "version": "5.8.10-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,9 +66,9 @@
     "@mikro-orm/core": "^5.8.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "5.8.10-dev.4",
-    "@mikro-orm/entity-generator": "5.8.10-dev.4",
-    "@mikro-orm/migrations": "5.8.10-dev.4",
+    "@mikro-orm/core": "5.8.10-dev.5",
+    "@mikro-orm/entity-generator": "5.8.10-dev.5",
+    "@mikro-orm/migrations": "5.8.10-dev.5",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.d.ts

@@ -7,6 +7,10 @@ import type { AbstractSqlDriver } from '../AbstractSqlDriver';
 import { QueryBuilderHelper, type Alias } from './QueryBuilderHelper';
 import type { SqlEntityManager } from '../SqlEntityManager';
 import type { Field } from '../typings';
+export interface ExecuteOptions {
+    mapResults?: boolean;
+    mergeResults?: boolean;
+}
 /**
  * SQL query builder with fluent interface.
  *
@@ -177,7 +181,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
      * Executes this QB and returns the raw results, mapped to the property names (unless disabled via last parameter).
      * Use `method` to specify what kind of result you want to get (array/single/meta).
      */
-    execute<U = any>(method?: 'all' | 'get' | 'run', mapResults?: boolean): Promise<U>;
+    execute<U = any>(method?: 'all' | 'get' | 'run', options?: ExecuteOptions | boolean): Promise<U>;
     /**
      * Alias for `qb.getResultList()`
      */

package/query/QueryBuilder.js

@@ -461,7 +461,10 @@ class QueryBuilder {
      * Executes this QB and returns the raw results, mapped to the property names (unless disabled via last parameter).
      * Use `method` to specify what kind of result you want to get (array/single/meta).
      */
-    async execute(method = 'all', mapResults = true) {
+    async execute(method = 'all', options) {
+        options = typeof options === 'boolean' ? { mapResults: options } : (options ?? {});
+        options.mergeResults ?? (options.mergeResults = true);
+        options.mapResults ?? (options.mapResults = true);
         if (!this.connectionType && method !== 'run' && [enums_1.QueryType.INSERT, enums_1.QueryType.UPDATE, enums_1.QueryType.DELETE, enums_1.QueryType.TRUNCATE].includes(this.type ?? enums_1.QueryType.SELECT)) {
             this.connectionType = 'write';
         }
@@ -473,7 +476,7 @@ class QueryBuilder {
         const type = this.connectionType || (method === 'run' ? 'write' : 'read');
         const res = await this.driver.getConnection(type).execute(query.sql, query.bindings, method, this.context);
         const meta = this.mainAlias.metadata;
-        if (!mapResults || !meta) {
+        if (!options.mapResults || !meta) {
             await this.em?.storeCache(this._cache, cached, res);
             return res;
         }
@@ -485,7 +488,7 @@ class QueryBuilder {
         if (Array.isArray(res)) {
             const map = {};
             mapped = res.map(r => this.driver.mapResult(r, meta, this._populate, this, map));
-            if (joinedProps.length > 0) {
+            if (options.mergeResults && joinedProps.length > 0) {
                 mapped = this.driver.mergeJoinedResult(mapped, this.mainAlias.metadata, joinedProps);
             }
         }