fix: Create correct children with STI and trees

This commit fixes the `create` function for EntityManager and TreeRepository to create entities of correct type when using Single Table Inheritance and complex inheritance with Trees. Related to: #7758
typeorm · Aug 22, 2022 · b006420 · b006420
1 parent a59e4bc
commit b006420
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/metadata-builder/EntityMetadataBuilder.ts b/src/metadata-builder/EntityMetadataBuilder.ts
@@ -607,6 +607,15 @@ export class EntityMetadataBuilder {
             ) {
                 entityMetadata.ownColumns.push(discriminatorColumn)
             }
+            // also copy the inheritance pattern & tree metadata
+            // this comes in handy when inheritance and trees are used together
+            entityMetadata.inheritancePattern = entityMetadata.parentEntityMetadata.inheritancePattern
+            if (!entityMetadata.treeType && !!entityMetadata.parentEntityMetadata.treeType) {
+                entityMetadata.treeType = entityMetadata.parentEntityMetadata.treeType
+                entityMetadata.treeOptions = entityMetadata.parentEntityMetadata.treeOptions
+                entityMetadata.treeParentRelation = entityMetadata.parentEntityMetadata.treeParentRelation
+                entityMetadata.treeLevelColumn = entityMetadata.parentEntityMetadata.treeLevelColumn
+            }
         }
 
         const { namingStrategy } = this.connection

diff --git a/src/metadata/EntityMetadata.ts b/src/metadata/EntityMetadata.ts
@@ -847,16 +847,18 @@ export class EntityMetadata {
     }
 
     /**
-     * In the case of SingleTableInheritance, find the correct child metadata
+     * In the case of SingleTableInheritance, find the correct metadata
      * for a given value.
      *
      * @param value The value to find the metadata for.
-     * @returns The found metadata for the child entity or the base metadata if no child was found.
+     * @returns The found metadata for the entity or the base metadata if no matching metadata
+     *          was found in the whole inheritance tree.
      */
-    findChildMetadata(value: any): EntityMetadata {
+    findInheritanceMetadata(value: any): EntityMetadata {
         // Check for single table inheritance and find the correct metadata in that case.
         // Goal is to use the correct discriminator as we could have a repository
         // for an (abstract) base class and thus the target would not match.
+
         if (
             this.inheritancePattern === "STI" &&
             this.childEntityMetadatas.length > 0
@@ -887,7 +889,7 @@ export class EntityMetadata {
         value: any,
         relation: RelationMetadata,
     ): EntityMetadata {
-        return relation.inverseEntityMetadata.findChildMetadata(value)
+        return relation.inverseEntityMetadata.findInheritanceMetadata(value)
     }
 
     // -------------------------------------------------------------------------

diff --git a/src/persistence/EntityPersistExecutor.ts b/src/persistence/EntityPersistExecutor.ts
@@ -83,7 +83,7 @@ export class EntityPersistExecutor {
 
                         let metadata = this.connection
                             .getMetadata(entityTarget)
-                            .findChildMetadata(entity)
+                            .findInheritanceMetadata(entity)
 
                         subjects.push(
                             new Subject({

diff --git a/src/query-builder/transformer/PlainObjectToNewEntityTransformer.ts b/src/query-builder/transformer/PlainObjectToNewEntityTransformer.ts
@@ -83,7 +83,7 @@ export class PlainObjectToNewEntityTransformer {
                         })
 
                         const inverseEntityMetadata =
-                            relation.inverseEntityMetadata.findChildMetadata(
+                            relation.inverseEntityMetadata.findInheritanceMetadata(
                                 objectRelatedValueItem,
                             )
 
@@ -115,7 +115,7 @@ export class PlainObjectToNewEntityTransformer {
                     }
 
                     const inverseEntityMetadata =
-                        relation.inverseEntityMetadata.findChildMetadata(
+                        relation.inverseEntityMetadata.findInheritanceMetadata(
                             objectRelatedValue,
                         )