@mikro-orm/knex 6.2.1-dev.4 → 6.2.1-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.1-dev.4",
+  "version": "6.2.1-dev.6",
   "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.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.1-dev.4"
+    "@mikro-orm/core": "6.2.1-dev.6"
   }
 }

package/query/QueryBuilder.js

@@ -232,7 +232,9 @@ class QueryBuilder {
             populate.push(...children);
         }
         prop.targetMeta.props
-            .filter(prop => explicitFields ? explicitFields.includes(prop.name) || prop.primary : this.platform.shouldHaveColumn(prop, populate))
+            .filter(prop => explicitFields
+            ? explicitFields.includes(prop.name) || explicitFields.includes(`${alias}.${prop.name}`) || prop.primary
+            : this.platform.shouldHaveColumn(prop, populate))
             .forEach(prop => fields.push(...this.driver.mapPropToFieldNames(this, prop, alias)));
         return fields;
     }

package/query/QueryBuilderHelper.js

@@ -189,7 +189,7 @@ class QueryBuilderHelper {
             if (schema) {
                 table = `${schema}.${table}`;
             }
-            if (!join.subquery) {
+            if (join.prop.name !== '__subquery__') {
                 join.primaryKeys.forEach((primaryKey, idx) => {
                     const right = `${join.alias}.${join.joinColumns[idx]}`;
                     if (join.prop.formula) {