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

package/AbstractSqlDriver.d.ts

@@ -35,7 +35,10 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
      * 1:1 owner side needs to be marked for population so QB auto-joins the owner id
      */
     protected autoJoinOneToOneOwner<T extends object, P extends string = never>(meta: EntityMetadata, populate: PopulateOptions<T>[], fields?: readonly EntityField<T, P>[]): PopulateOptions<T>[];
-    protected joinedProps<T>(meta: EntityMetadata, populate: PopulateOptions<T>[]): PopulateOptions<T>[];
+    /**
+     * @internal
+     */
+    joinedProps<T>(meta: EntityMetadata, populate: PopulateOptions<T>[]): PopulateOptions<T>[];
     /**
      * @internal
      */

package/AbstractSqlDriver.js

@@ -49,11 +49,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             qb.setLockMode(options.lockMode, options.lockTableAliases);
         }
         core_1.Utils.asArray(options.flags).forEach(flag => qb.setFlag(flag));
-        const result = await this.rethrow(qb.execute('all'));
-        if (joinedProps.length > 0) {
-            return this.mergeJoinedResult(result, meta, joinedProps);
-        }
-        return result;
+        return this.rethrow(qb.execute('all'));
     }
     async findOne(entityName, where, options) {
         const opts = { populate: [], ...(options || {}) };
@@ -135,8 +131,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         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;
     }
@@ -151,7 +145,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);
-            let relationPojo = {};
+            const 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 => {
@@ -190,22 +184,6 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     delete root[alias];
                 }
             });
-            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];
-                Object.assign(old, relationPojo);
-                relationPojo = old;
-            }
-            else {
-                map[key2] = relationPojo;
-            }
-            if (map[key]) {
-                result[relation.name] = map[key][relation.name];
-            }
-            else {
-                map[key] = result;
-            }
             if ([core_1.ReferenceType.MANY_TO_MANY, core_1.ReferenceType.ONE_TO_MANY].includes(relation.reference)) {
                 result[relation.name] = result[relation.name] || [];
                 this.appendToCollection(meta2, result[relation.name], relationPojo);
@@ -603,6 +581,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             .map(prop => ({ field: prop.name, strategy: prop.strategy }));
         return [...populate, ...toPopulate];
     }
+    /**
+     * @internal
+     */
     joinedProps(meta, populate) {
         return populate.filter(p => {
             const prop = meta.properties[p.field] || {};
@@ -613,26 +594,33 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
      * @internal
      */
     mergeJoinedResult(rawResults, meta, joinedProps) {
-        // group by the root entity primary key first
-        const map = {};
         const res = [];
-        rawResults.forEach(item => {
+        const map = {};
+        for (const item of rawResults) {
             const pk = core_1.Utils.getCompositeKeyHash(item, meta);
             if (map[pk]) {
-                joinedProps.forEach(hint => {
-                    // Sometimes we might join a M:N relation with additional filter on the target entity, and as a result, we get
-                    // the first result with `null` for all target values, which is mapped as empty array. When we see that happen,
-                    // we need to merge the results of the next item.
-                    if (Array.isArray(map[pk][hint.field]) && Array.isArray(item[hint.field]) && map[pk][hint.field].length === 0) {
-                        item[hint.field].forEach((el) => map[pk][hint.field].push(el));
+                for (const hint of joinedProps) {
+                    const prop = meta.properties[hint.field];
+                    if (!item[hint.field]) {
+                        continue;
                     }
-                });
+                    switch (prop.reference) {
+                        case core_1.ReferenceType.ONE_TO_MANY:
+                        case core_1.ReferenceType.MANY_TO_MANY:
+                            map[pk][hint.field] = this.mergeJoinedResult([...map[pk][hint.field], ...item[hint.field]], prop.targetMeta, hint.children ?? []);
+                            break;
+                        case core_1.ReferenceType.MANY_TO_ONE:
+                        case core_1.ReferenceType.ONE_TO_ONE:
+                            map[pk][hint.field] = this.mergeJoinedResult([map[pk][hint.field], item[hint.field]], prop.targetMeta, hint.children ?? [])[0];
+                            break;
+                    }
+                }
             }
             else {
                 map[pk] = item;
                 res.push(item);
             }
-        });
+        }
         return res;
     }
     getFieldsForJoinedLoad(qb, meta, explicitFields, populate = [], parentTableAlias, parentJoinPath) {
@@ -837,7 +825,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     buildFields(meta, populate, joinedProps, qb, fields) {
         const lazyProps = meta.props.filter(prop => prop.lazy && !populate.some(p => p.field === prop.name || p.all));
         const hasLazyFormulas = meta.props.some(p => p.lazy && p.formula);
-        const requiresSQLConversion = meta.props.some(p => p.customType?.convertToJSValueSQL);
+        const requiresSQLConversion = meta.props.some(p => p.customType?.convertToJSValueSQL && p.persist !== false);
         const hasExplicitFields = !!fields;
         const ret = [];
         if (joinedProps.length > 0) {

package/package.json

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

package/query/QueryBuilder.js

@@ -477,14 +477,25 @@ class QueryBuilder {
             await this.em?.storeCache(this._cache, cached, res);
             return res;
         }
-        if (method === 'all' && Array.isArray(res)) {
+        if (method === 'run') {
+            return res;
+        }
+        const joinedProps = this.driver.joinedProps(meta, this._populate);
+        let mapped;
+        if (Array.isArray(res)) {
             const map = {};
-            const mapped = res.map(r => this.driver.mapResult(r, meta, this._populate, this, map));
-            await this.em?.storeCache(this._cache, cached, mapped);
-            return mapped;
+            mapped = res.map(r => this.driver.mapResult(r, meta, this._populate, this, map));
+            if (joinedProps.length > 0) {
+                mapped = this.driver.mergeJoinedResult(mapped, this.mainAlias.metadata, joinedProps);
+            }
+        }
+        else {
+            mapped = [this.driver.mapResult(res, meta, joinedProps, this)];
         }
-        const mapped = this.driver.mapResult(res, meta, this._populate, this);
         await this.em?.storeCache(this._cache, cached, mapped);
+        if (method === 'get') {
+            return mapped[0];
+        }
         return mapped;
     }
     /**
@@ -498,10 +509,7 @@ class QueryBuilder {
      */
     async getResultList() {
         await this.em.tryFlush(this.mainAlias.entityName, { flushMode: this.flushMode });
-        let res = await this.execute('all', true);
-        if (this._joinedProps.size > 0) {
-            res = this.driver.mergeJoinedResult(res, this.mainAlias.metadata, [...this._joinedProps.values()]);
-        }
+        const res = await this.execute('all', true);
         const entities = [];
         function propagatePopulateHint(entity, hint) {
             var _a;
@@ -725,7 +733,7 @@ class QueryBuilder {
         });
         const meta = this.mainAlias.metadata;
         /* istanbul ignore next */
-        const requiresSQLConversion = meta?.props.filter(p => p.hasConvertToJSValueSQL) ?? [];
+        const requiresSQLConversion = meta?.props.filter(p => p.hasConvertToJSValueSQL && p.persist !== false) ?? [];
         if (this.flags.has(core_1.QueryFlag.CONVERT_CUSTOM_TYPES) && (fields.includes('*') || fields.includes(`${this.mainAlias.aliasName}.*`)) && requiresSQLConversion.length > 0) {
             requiresSQLConversion.forEach(p => ret.push(this.helper.mapper(p.name, this.type)));
         }

package/schema/SchemaComparator.js

@@ -363,7 +363,9 @@ class SchemaComparator {
             log(`'comment' changed for column ${tableName}.${column1.name}`, { column1, column2 });
             changedProperties.add('comment');
         }
-        if (this.diffEnumItems(column1.enumItems, column2.enumItems)) {
+        if (!(column1.mappedType instanceof core_1.ArrayType) &&
+            !(column2.mappedType instanceof core_1.ArrayType) &&
+            this.diffEnumItems(column1.enumItems, column2.enumItems)) {
             log(`'enumItems' changed for column ${tableName}.${column1.name}`, { column1, column2 });
             changedProperties.add('enumItems');
         }