@mikro-orm/knex 6.4.7-dev.11 → 6.4.7-dev.13

package/AbstractSqlDriver.js

@@ -930,11 +930,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath, count) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate, options);
-        const shouldHaveColumn = (prop, populate, fields) => {
+        const shouldHaveColumn = (meta, prop, populate, fields) => {
             if (!this.platform.shouldHaveColumn(prop, populate, exclude)) {
                 return false;
             }
-            if (!fields || fields.includes('*') || prop.primary) {
+            if (!fields || fields.includes('*') || prop.primary || meta.root.discriminatorColumn === prop.name) {
                 return true;
             }
             return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
@@ -944,7 +944,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (parentJoinPath) {
             // alias all fields in the primary table
             meta.props
-                .filter(prop => shouldHaveColumn(prop, populate, explicitFields))
+                .filter(prop => shouldHaveColumn(meta, prop, populate, explicitFields))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, parentTableAlias)));
         }
         for (const hint of joinedProps) {
@@ -1281,6 +1281,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             if (!options.fields.includes('*') && !options.fields.includes(`${qb.alias}.*`)) {
                 ret.unshift(...meta.primaryKeys.filter(pk => !options.fields.includes(pk)));
             }
+            if (meta.root.discriminatorColumn && !options.fields.includes(`${qb.alias}.${meta.root.discriminatorColumn}`)) {
+                ret.push(meta.root.discriminatorColumn);
+            }
         }
         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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.7-dev.11",
+  "version": "6.4.7-dev.13",
   "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,7 +66,7 @@
     "@mikro-orm/core": "^6.4.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.11",
+    "@mikro-orm/core": "6.4.7-dev.13",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"