Revert "fix: STI types on children in joins (#3160)" (#8309)

This reverts commit 60a6c5d.
typeorm · Oct 27, 2021 · 0adad88 · 0adad88
1 parent 2c861af
commit 0adad88
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 200 deletions.
diff --git a/src/query-builder/transformer/RawSqlResultsToEntityTransformer.ts b/src/query-builder/transformer/RawSqlResultsToEntityTransformer.ts
@@ -172,15 +172,8 @@ export class RawSqlResultsToEntityTransformer {
 
             // this check need to avoid setting properties than not belong to entity when single table inheritance used. (todo: check if we still need it)
             // const metadata = metadata.childEntityMetadatas.find(childEntityMetadata => discriminatorValue === childEntityMetadata.discriminatorValue);
-            if (join.relation) {
-                const relation = metadata.relations.find(relation => relation.propertyPath === join.relation!.propertyPath);
-                if (!relation)
-                    return;
-
-                // Use current entity's type metadata, join might be from an STI parent with a different type
-                if (relation.inverseEntityMetadata)
-                    join.alias.metadata = relation.inverseEntityMetadata;
-            }
+            if (join.relation && !metadata.relations.find(relation => relation === join.relation))
+                return;
 
             // some checks to make sure this join is for current alias
             if (join.mapToProperty) {

diff --git a/...ional/table-inheritance/single-table/relations/child-relation-type/child-relation-type.ts b/...ional/table-inheritance/single-table/relations/child-relation-type/child-relation-type.ts
diff --git a/...ctional/table-inheritance/single-table/relations/child-relation-type/entity/Accountant.ts b/...ctional/table-inheritance/single-table/relations/child-relation-type/entity/Accountant.ts
diff --git a/test/functional/table-inheritance/single-table/relations/child-relation-type/entity/Data.ts b/test/functional/table-inheritance/single-table/relations/child-relation-type/entity/Data.ts
diff --git a/...ctional/table-inheritance/single-table/relations/child-relation-type/entity/Department.ts b/...ctional/table-inheritance/single-table/relations/child-relation-type/entity/Department.ts
diff --git a/.../functional/table-inheritance/single-table/relations/child-relation-type/entity/Person.ts b/.../functional/table-inheritance/single-table/relations/child-relation-type/entity/Person.ts
diff --git a/...nal/table-inheritance/single-table/relations/child-relation-type/entity/Specialization.ts b/...nal/table-inheritance/single-table/relations/child-relation-type/entity/Specialization.ts
diff --git a/...functional/table-inheritance/single-table/relations/child-relation-type/entity/Teacher.ts b/...functional/table-inheritance/single-table/relations/child-relation-type/entity/Teacher.ts