fix: QueryFailedError when tree entity with JoinColumn (#8443) (#8447)

* fix: QueryFailedError when tree entity with joinColumns (#8443) * test: add test for #8443
typeorm · Feb 15, 2022 · a11c50d · a11c50d
1 parent e0adeee
commit a11c50d
Show file tree

Hide file tree

Showing 7 changed files with 1,775 additions and 3 deletions.
diff --git a/src/repository/TreeRepository.ts b/src/repository/TreeRepository.ts
@@ -33,9 +33,9 @@ export class TreeRepository<Entity> extends Repository<Entity> {
     findRoots(options?: FindTreeOptions): Promise<Entity[]> {
         const escapeAlias = (alias: string) => this.manager.connection.driver.escape(alias);
         const escapeColumn = (column: string) => this.manager.connection.driver.escape(column);
-        const parentPropertyName = this.manager.connection.namingStrategy.joinColumnName(
-            this.metadata.treeParentRelation!.propertyName, this.metadata.primaryColumns[0].propertyName
-        );
+
+        const joinColumn = this.metadata.treeParentRelation!.joinColumns[0];
+        const parentPropertyName = joinColumn.givenDatabaseName || joinColumn.databaseName;
 
         const qb = this.createQueryBuilder("treeEntity");
         FindOptionsUtils.applyOptionsToTreeQueryBuilder(qb, options);