@mikro-orm/core 7.0.9-dev.9 → 7.0.10-dev.0

package/MikroORM.js

@@ -173,7 +173,6 @@ export class MikroORM {
         this.em = this.driver.createEntityManager();
         this.em.global = true;
         this.#metadata.decorate(this.em);
-        this.driver.setMetadata(this.#metadata);
     }
     /**
      * Allows dynamically discovering new entity by reference, handy for testing schema diffing.

package/drivers/DatabaseDriver.d.ts

@@ -3,7 +3,7 @@ import type { ConnectionType, Constructor, Dictionary, EntityData, EntityDiction
 import type { MetadataStorage } from '../metadata/MetadataStorage.js';
 import type { Connection, QueryResult, Transaction } from '../connections/Connection.js';
 import { type Configuration, type ConnectionOptions } from '../utils/Configuration.js';
-import { EntityComparator } from '../utils/EntityComparator.js';
+import type { EntityComparator } from '../utils/EntityComparator.js';
 import { type QueryOrder } from '../enums.js';
 import type { Platform } from '../platforms/Platform.js';
 import type { Collection } from '../entity/Collection.js';

package/drivers/DatabaseDriver.js

@@ -1,7 +1,6 @@
 import { EntityManagerType, } from './IDatabaseDriver.js';
 import { Utils } from '../utils/Utils.js';
 import { Cursor } from '../utils/Cursor.js';
-import { EntityComparator } from '../utils/EntityComparator.js';
 import { isRaw, raw } from '../utils/RawQueryFragment.js';
 import { QueryOrderNumeric, ReferenceKind } from '../enums.js';
 import { EntityManager } from '../EntityManager.js';
@@ -103,7 +102,7 @@ export class DatabaseDriver {
     /** Sets the metadata storage and initializes the comparator for all connections. */
     setMetadata(metadata) {
         this.metadata = metadata;
-        this.comparator = new EntityComparator(this.metadata, this.platform);
+        this.comparator = this.config.getComparator(metadata);
         this.connection.setMetadata(metadata);
         this.connection.setPlatform(this.platform);
         this.replicas.forEach(replica => {
@@ -310,7 +309,7 @@ export class DatabaseDriver {
             if (prop.joinColumns && Array.isArray(data[k])) {
                 const copy = Utils.flatten(data[k]);
                 delete data[k];
-                prop.joinColumns.forEach((joinColumn, idx) => (data[joinColumn] = copy[idx]));
+                (prop.ownColumns ?? prop.joinColumns).forEach(col => (data[col] = copy[prop.joinColumns.indexOf(col)]));
                 return;
             }
             if (prop.joinColumns?.length > 1 && data[k] == null) {

package/entity/EntityFactory.js

@@ -167,9 +167,11 @@ export class EntityFactory {
             return diff2[key] === undefined;
         })
             .forEach(key => delete diff2[key]);
-        // but always add collection properties and formulas if they are part of the `data`
+        // but always add collection properties, formulas, and generated columns if they are part of the `data`,
+        // as these are excluded from `comparableProps` and won't appear in the diff
         Utils.keys(data)
             .filter(key => meta.properties[key]?.formula ||
+            (meta.properties[key]?.generated && !meta.properties[key]?.primary) ||
             [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
             .forEach(key => (diff2[key] = data[key]));
         // rehydrated with the new values, skip those changed by user

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.9-dev.9",
+  "version": "7.0.10-dev.0",
   "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.",
   "keywords": [
     "data-mapper",

package/platforms/Platform.js

@@ -323,14 +323,47 @@ export class Platform {
     }
     /** Serializes a string array into its database storage format. */
     marshallArray(values) {
-        return values.join(',');
+        return values.map(v => (/[,",\\]/.test(v) ? JSON.stringify(v) : v)).join(',');
     }
     /** Deserializes a database-stored array string back into a string array. */
     unmarshallArray(value) {
         if (value === '') {
             return [];
         }
-        return value.split(',');
+        if (!value.includes('"')) {
+            return value.split(',');
+        }
+        const result = [];
+        let i = 0;
+        while (i < value.length) {
+            if (value[i] === '"') {
+                let j = i + 1;
+                while (j < value.length) {
+                    if (value[j] === '\\') {
+                        j += 2;
+                    }
+                    else if (value[j] === '"') {
+                        j++;
+                        break;
+                    }
+                    else {
+                        j++;
+                    }
+                }
+                result.push(JSON.parse(value.substring(i, j)));
+                i = j + 1;
+            }
+            else {
+                const comma = value.indexOf(',', i);
+                if (comma === -1) {
+                    result.push(value.substring(i));
+                    break;
+                }
+                result.push(value.substring(i, comma));
+                i = comma + 1;
+            }
+        }
+        return result;
     }
     getBlobDeclarationSQL() {
         return 'blob';

package/utils/Utils.js

@@ -132,7 +132,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.9-dev.9';
+    static #ORM_VERSION = '7.0.10-dev.0';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */