@mikro-orm/knex 6.0.0-dev.109 → 6.0.0-dev.110

package/AbstractSqlDriver.js

@@ -148,7 +148,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return null;
         }
         if (qb) {
+            // here we map the aliased results (cartesian product) to an object graph
             this.mapJoinedProps(ret, meta, populate, qb, ret, map);
+            // we need to remove the cycles from the mapped values
+            core_1.Utils.removeCycles(ret, meta);
         }
         return ret;
     }
@@ -163,7 +166,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const meta2 = this.metadata.find(relation.type);
             const path = parentJoinPath ? `${parentJoinPath}.${relation.name}` : `${meta.name}.${relation.name}`;
             const relationAlias = qb.getAliasForJoinPath(path);
-            const relationPojo = {};
+            let relationPojo = {};
             // If the primary key value for the relation is null, we know we haven't joined to anything
             // and therefore we don't return any record (since all values would be null)
             const hasPK = meta2.primaryKeys.every(pk => meta2.properties[pk].fieldNames.every(name => {
@@ -179,6 +182,17 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 return;
             }
             const tz = this.platform.getTimezone();
+            meta2.props
+                .filter(prop => prop.persist === false && prop.fieldNames)
+                .forEach(prop => {
+                if (prop.fieldNames.length > 1) { // composite keys
+                    relationPojo[prop.name] = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
+                }
+                else {
+                    const alias = `${relationAlias}__${prop.fieldNames[0]}`;
+                    relationPojo[prop.name] = root[alias];
+                }
+            });
             meta2.props
                 .filter(prop => this.platform.shouldHaveColumn(prop, p.children || []))
                 .forEach(prop => {
@@ -197,7 +211,18 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     delete root[alias];
                 }
             });
-            const key = `${meta.name}-${(core_1.Utils.getCompositeKeyHash(result, meta))}`;
+            const key = `${meta.name}-${core_1.Utils.getCompositeKeyHash(result, meta)}`;
+            const key2 = `${meta2.name}-${core_1.Utils.getCompositeKeyHash(relationPojo, meta2)}`;
+            if (map[key2]) {
+                const old = map[key2];
+                core_1.Utils.keys(relationPojo)
+                    .filter(k => relationPojo[k] != null)
+                    .forEach(k => old[k] = relationPojo[k]);
+                relationPojo = old;
+            }
+            else {
+                map[key2] = relationPojo;
+            }
             if (map[key]) {
                 result[relation.name] = map[key][relation.name];
             }
@@ -299,16 +324,14 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 const keys = [];
                 props.forEach(prop => {
                     if (prop.fieldNames.length > 1) {
-                        const param = [...row[prop.name] ?? prop.fieldNames.map(() => null)];
-                        const key = (row[prop.name] ?? prop.fieldNames).map(() => '?');
+                        const param = core_1.Utils.flatten([...row[prop.name] ?? prop.fieldNames.map(() => null)]);
+                        const key = param.map(() => '?');
                         prop.fieldNames.forEach((field, idx) => {
-                            if (duplicates.includes(field)) {
-                                param.splice(idx, 1);
-                                key.splice(idx, 1);
+                            if (!duplicates.includes(field)) {
+                                params.push(param[idx]);
+                                keys.push(key[idx]);
                             }
                         });
-                        params.push(...param);
-                        keys.push(...key);
                     }
                     else if (prop.customType && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(row[prop.name])) {
                         keys.push(prop.customType.convertToDatabaseValueSQL('?', this.platform));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.109",
+  "version": "6.0.0-dev.110",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.8.3"
+    "@mikro-orm/core": "^5.8.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.109"
+    "@mikro-orm/core": "6.0.0-dev.110"
   }
 }

package/query/QueryBuilderHelper.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { LockMode, type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityProperty, type FlatQueryOrderMap, type QBFilterQuery } from '@mikro-orm/core';
+import { type Dictionary, type EntityData, type EntityKey, type EntityMetadata, type EntityProperty, type FlatQueryOrderMap, LockMode, type QBFilterQuery } from '@mikro-orm/core';
 import { QueryType } from './enums';
 import type { Field, JoinOptions } from '../typings';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';

package/query/QueryBuilderHelper.js

@@ -171,8 +171,13 @@ class QueryBuilderHelper {
             }
             if (!join.subquery) {
                 join.primaryKeys.forEach((primaryKey, idx) => {
-                    const left = `${join.ownerAlias}.${primaryKey}`;
                     const right = `${join.alias}.${join.joinColumns[idx]}`;
+                    if (join.prop.formula) {
+                        const left = join.prop.formula(join.ownerAlias);
+                        conditions.push(`${left} = ${this.knex.ref(right)}`);
+                        return;
+                    }
+                    const left = join.prop.kind === core_1.ReferenceKind.SCALAR && join.prop.persist === false ? primaryKey : `${join.ownerAlias}.${primaryKey}`;
                     conditions.push(`${this.knex.ref(left)} = ${this.knex.ref(right)}`);
                 });
             }

package/schema/DatabaseTable.js

@@ -81,8 +81,8 @@ class DatabaseTable {
                 unsigned: prop.unsigned && this.platform.isNumericColumn(mappedType),
                 autoincrement: prop.autoincrement ?? primary,
                 primary,
+                nullable: this.columns[field]?.nullable ?? !!prop.nullable,
                 nativeEnumName: prop.nativeEnumName,
-                nullable: !!prop.nullable,
                 length: prop.length,
                 precision: prop.precision,
                 scale: prop.scale,