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

package/AbstractSqlDriver.js

@@ -799,7 +799,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const relationsToPopulate = populate.map(({ field }) => field.split(':')[0]);
         const toPopulate = meta.relations
-            .filter(prop => prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner && !relationsToPopulate.includes(prop.name))
+            .filter(prop => prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner && !prop.lazy && !relationsToPopulate.includes(prop.name))
             .filter(prop => fields.length === 0 || fields.some(f => prop.name === f || prop.name.startsWith(`${String(f)}.`)))
             .map(prop => ({ field: `${prop.name}:ref`, strategy: prop.strategy }));
         return [...populate, ...toPopulate];
@@ -1205,7 +1205,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 ret.unshift(...meta.primaryKeys.filter(pk => !options.fields.includes(pk)));
             }
         }
-        else if (!core_1.Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula)) {
+        else if (!core_1.Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula && (p.kind !== '1:1' || p.owner))) {
             const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude, false));
             ret.push(...props.filter(p => !lazyProps.includes(p)).map(p => p.name));
             addFormulas = true;

package/package.json

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

package/query/QueryBuilder.js

@@ -231,6 +231,21 @@ class QueryBuilder {
             }
             populate.push(...children);
         }
+        for (const p of prop.targetMeta.getPrimaryProps()) {
+            fields.push(...this.driver.mapPropToFieldNames(this, p, alias));
+        }
+        if (explicitFields) {
+            for (const field of explicitFields) {
+                const [a, f] = this.helper.splitField(field);
+                const p = prop.targetMeta.properties[f];
+                if (p) {
+                    fields.push(...this.driver.mapPropToFieldNames(this, p, alias));
+                }
+                else {
+                    fields.push(`${a}.${f} as ${a}__${f}`);
+                }
+            }
+        }
         prop.targetMeta.props
             .filter(prop => explicitFields
             ? explicitFields.includes(prop.name) || explicitFields.includes(`${alias}.${prop.name}`) || prop.primary