archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

escape alias & columns in findRoots

Browse Source
This commit is contained in:
Salim Benabbou 2017-06-22 15:44:53 +00:00
parent f415bd8900
commit 3df9cb1e60
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/repository/TreeRepository.ts
View File

@ -32,9 +32,13 @@ export class TreeRepository<Entity> extends Repository<Entity> {
*/
findRoots(): Promise<Entity[]> {
const parentPropertyName = this.metadata.treeParentRelation!.propertyName;
const parentPropertyName = this.metadata.treeParentRelation!.propertyName + "Id";
const escapeAlias = (alias: string) => this.manager.connection.driver.escapeAlias(alias);
const escapeColumn = (column: string) => this.manager.connection.driver.escapeColumn(column);
return this.createQueryBuilder("treeEntity")
.where(`treeEntity.${parentPropertyName}Id IS NULL`)
.from(this.metadata.target, "treeEntity")
.where(`${escapeAlias("treeEntity")}.${escapeColumn(parentPropertyName)} IS NULL`)
.getMany();
}
@ -51,6 +55,7 @@ export class TreeRepository<Entity> extends Repository<Entity> {
return this.createQueryBuilder(alias)
.innerJoin(this.metadata.closureJunctionTable.tableName, closureTableAlias, joinCondition)
.where(`${escapeAlias(closureTableAlias)}.${escapeColumn("ancestor")}=${this.metadata.getEntityIdMap(entity)![this.metadata.primaryColumns[0].propertyName]}`);
}
/**