@mikro-orm/core 7.0.8-dev.6 → 7.0.8-dev.8

package/package.json

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

package/unit-of-work/UnitOfWork.js

@@ -292,7 +292,12 @@ export class UnitOfWork {
             cs.type = type;
         }
         this.initIdentifier(entity);
-        this.#changeSets.set(entity, cs);
+        if (wrapped.__meta.inheritanceType === 'tpt' && wrapped.__meta.tptParent) {
+            this.createTPTChangeSets(entity, cs);
+        }
+        else {
+            this.#changeSets.set(entity, cs);
+        }
         this.#persistStack.delete(entity);
         wrapped.__originalEntityData = this.#comparator.prepareEntity(entity);
     }
@@ -304,8 +309,37 @@ export class UnitOfWork {
         }
         const cs = this.#changeSetComputer.computeChangeSet(entity);
         if (cs && !this.checkUniqueProps(cs)) {
-            Object.assign(changeSet.payload, cs.payload);
-            helper(entity).__originalEntityData = this.#comparator.prepareEntity(entity);
+            const wrapped = helper(entity);
+            // For TPT entities, update only each table's own properties so parent
+            // columns don't leak into the leaf table's INSERT/UPDATE (GH #7455).
+            if (wrapped.__meta.inheritanceType === 'tpt' && wrapped.__meta.tptParent) {
+                for (const prop of wrapped.__meta.ownProps) {
+                    if (prop.name in cs.payload) {
+                        changeSet.payload[prop.name] = cs.payload[prop.name];
+                    }
+                }
+                changeSet.tptChangeSets ??= [];
+                let current = wrapped.__meta.tptParent;
+                let idx = 0;
+                while (current) {
+                    let parentCs = changeSet.tptChangeSets.find(pc => pc.meta === current);
+                    if (!parentCs) {
+                        parentCs = new ChangeSet(entity, changeSet.type, {}, current);
+                        changeSet.tptChangeSets.splice(idx, 0, parentCs);
+                    }
+                    idx++;
+                    for (const prop of current.ownProps) {
+                        if (prop.name in cs.payload) {
+                            parentCs.payload[prop.name] = cs.payload[prop.name];
+                        }
+                    }
+                    current = current.tptParent;
+                }
+            }
+            else {
+                Object.assign(changeSet.payload, cs.payload);
+            }
+            wrapped.__originalEntityData = this.#comparator.prepareEntity(entity);
         }
     }
     /** Marks an entity for persistence, cascading to related entities. */

package/utils/EntityComparator.d.ts

@@ -70,6 +70,7 @@ export declare class EntityComparator {
      */
     private shouldSerialize;
     private getEmbeddedPropertySnapshot;
+    private getInlineEmbeddedNullLines;
     private registerCustomType;
     private getPropertySnapshot;
     /**

package/utils/EntityComparator.js

@@ -457,15 +457,7 @@ export class EntityComparator {
         else {
             ret += `${padding}if (${nullCond}) {\n`;
             ret +=
-                meta.props
-                    .filter(p => p.embedded?.[0] === prop.name &&
-                    // object for JSON embeddable
-                    (p.object || p.persist !== false))
-                    .map(childProp => {
-                    const childDataKey = meta.embeddable || prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-                    return `${padding}  ret${childDataKey} = null;`;
-                })
-                    .join('\n') + `\n`;
+                this.getInlineEmbeddedNullLines(meta, prop.name, padding, dataKey, !!(meta.embeddable || prop.object)).join('\n') + `\n`;
             ret += `${padding}}\n`;
         }
         const cond = `entity${path.map(k => this.wrap(k)).join('')} != null`;
@@ -515,6 +507,17 @@ export class EntityComparator {
         }
         return `${ret}${padding}}`;
     }
+    getInlineEmbeddedNullLines(meta, parentName, padding, dataKey, useEmbeddedKey) {
+        return meta.props
+            .filter(p => p.embedded?.[0] === parentName && (p.object || p.persist !== false))
+            .flatMap(childProp => {
+            const childDataKey = useEmbeddedKey ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+            if (childProp.kind === ReferenceKind.EMBEDDED && !childProp.object) {
+                return this.getInlineEmbeddedNullLines(meta, childProp.name, padding, childDataKey, useEmbeddedKey);
+            }
+            return [`${padding}  ret${childDataKey} = null;`];
+        });
+    }
     registerCustomType(prop, context) {
         const convertorKey = this.safeKey(prop.name);
         context.set(`convertToDatabaseValue_${convertorKey}`, (val) => {

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.8-dev.6';
+    static #ORM_VERSION = '7.0.8-dev.8';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */