@mikro-orm/knex 5.7.8-dev.0 → 5.7.8-dev.2

package/AbstractSqlConnection.js

@@ -85,14 +85,14 @@ class AbstractSqlConnection extends core_1.Connection {
         }
         const formatted = this.platform.formatQuery(queryOrKnex, params);
         const sql = this.getSql(queryOrKnex, formatted);
-        const res = await this.executeQuery(sql, () => {
+        return this.executeQuery(sql, async () => {
             const query = this.client.raw(formatted);
             if (ctx) {
                 query.transacting(ctx);
             }
-            return query;
+            const res = await query;
+            return this.transformRawResult(res, method);
         }, { query: queryOrKnex, params });
-        return this.transformRawResult(res, method);
     }
     /**
      * Execute raw SQL queries from file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.7.8-dev.0",
+  "version": "5.7.8-dev.2",
   "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.7.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.7.8-dev.0",
-    "@mikro-orm/entity-generator": "~5.7.8-dev.0",
-    "@mikro-orm/migrations": "~5.7.8-dev.0",
+    "@mikro-orm/core": "~5.7.8-dev.2",
+    "@mikro-orm/entity-generator": "~5.7.8-dev.2",
+    "@mikro-orm/migrations": "~5.7.8-dev.2",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/QueryBuilder.d.ts

@@ -90,9 +90,10 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     count(field?: string | string[], distinct?: boolean): CountQueryBuilder<T>;
     join(field: string, alias: string, cond?: QBFilterQuery, type?: 'leftJoin' | 'innerJoin' | 'pivotJoin', path?: string): this;
     leftJoin(field: string, alias: string, cond?: QBFilterQuery): this;
-    joinAndSelect(field: string, alias: string, cond?: QBFilterQuery, type?: 'leftJoin' | 'innerJoin' | 'pivotJoin', path?: string): SelectQueryBuilder<T>;
-    leftJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery): SelectQueryBuilder<T>;
-    protected getFieldsForJoinedLoad<U extends object>(prop: EntityProperty<U>, alias: string): Field<U>[];
+    joinAndSelect(field: string, alias: string, cond?: QBFilterQuery, type?: 'leftJoin' | 'innerJoin' | 'pivotJoin', path?: string, fields?: string[]): SelectQueryBuilder<T>;
+    leftJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery, fields?: string[]): SelectQueryBuilder<T>;
+    innerJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery, fields?: string[]): SelectQueryBuilder<T>;
+    protected getFieldsForJoinedLoad<U extends object>(prop: EntityProperty<U>, alias: string, explicitFields?: string[]): Field<U>[];
     withSubQuery(subQuery: Knex.QueryBuilder, alias: string): this;
     where(cond: QBFilterQuery<T>, operator?: keyof typeof GroupOperator): this;
     where(cond: string, params?: any[], operator?: keyof typeof GroupOperator): this;

package/query/QueryBuilder.js

@@ -130,12 +130,12 @@ class QueryBuilder {
     leftJoin(field, alias, cond = {}) {
         return this.join(field, alias, cond, 'leftJoin');
     }
-    joinAndSelect(field, alias, cond = {}, type = 'innerJoin', path) {
+    joinAndSelect(field, alias, cond = {}, type = 'innerJoin', path, fields) {
         if (!this.type) {
             this.select('*');
         }
         const prop = this.joinReference(field, alias, cond, type, path);
-        this.addSelect(this.getFieldsForJoinedLoad(prop, alias));
+        this.addSelect(this.getFieldsForJoinedLoad(prop, alias, fields));
         const [fromAlias] = this.helper.splitField(field);
         const populate = this._joinedProps.get(fromAlias);
         const item = { field: prop.name, strategy: core_1.LoadStrategy.JOINED, children: [] };
@@ -148,13 +148,16 @@ class QueryBuilder {
         this._joinedProps.set(alias, item);
         return this;
     }
-    leftJoinAndSelect(field, alias, cond = {}) {
-        return this.joinAndSelect(field, alias, cond, 'leftJoin');
+    leftJoinAndSelect(field, alias, cond = {}, fields) {
+        return this.joinAndSelect(field, alias, cond, 'leftJoin', undefined, fields);
     }
-    getFieldsForJoinedLoad(prop, alias) {
+    innerJoinAndSelect(field, alias, cond = {}, fields) {
+        return this.joinAndSelect(field, alias, cond, 'innerJoin', undefined, fields);
+    }
+    getFieldsForJoinedLoad(prop, alias, explicitFields) {
         const fields = [];
         prop.targetMeta.props
-            .filter(prop => this.platform.shouldHaveColumn(prop, this._populate))
+            .filter(prop => explicitFields ? explicitFields.includes(prop.name) || prop.primary : this.platform.shouldHaveColumn(prop, this._populate))
             .forEach(prop => fields.push(...this.driver.mapPropToFieldNames(this, prop, alias)));
         return fields;
     }

package/typings.d.ts

@@ -122,7 +122,8 @@ export interface IQueryBuilder<T> {
     join(field: string, alias: string, cond?: QBFilterQuery, type?: 'leftJoin' | 'innerJoin' | 'pivotJoin', path?: string): this;
     leftJoin(field: string, alias: string, cond?: QBFilterQuery): this;
     joinAndSelect(field: string, alias: string, cond?: QBFilterQuery): this;
-    leftJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery): this;
+    leftJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery, fields?: string[]): this;
+    innerJoinAndSelect(field: string, alias: string, cond?: QBFilterQuery, fields?: string[]): this;
     withSubQuery(subQuery: Knex.QueryBuilder, alias: string): this;
     where(cond: QBFilterQuery<T>, operator?: keyof typeof GroupOperator): this;
     where(cond: string, params?: any[], operator?: keyof typeof GroupOperator): this;