fix: resolve issue with find with relations returns soft-deleted enti…

…ties This new feature changes the behavior of typeorm to allow avoiding entities that have soft delete close: typeorm#6265
luiseariass · Jan 19, 2021 · 2f245e0 · 2f245e0
1 parent af2c5c4
commit 2f245e0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/query-builder/SelectQueryBuilder.ts b/src/query-builder/SelectQueryBuilder.ts
@@ -1336,7 +1336,10 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
         this.expressionMap.joinAttributes.push(joinAttribute);
 
         if (joinAttribute.metadata) {
-
+           if (joinAttribute.metadata.deleteDateColumn && !this.expressionMap.withDeleted) {
+                const conditionDeleteColumn = `${aliasName}.${joinAttribute.metadata.deleteDateColumn.propertyName} is null`;
+                joinAttribute.condition += joinAttribute.condition ? ` and ${conditionDeleteColumn}`: `${conditionDeleteColumn}`;
+            }
             // todo: find and set metadata right there?
             joinAttribute.alias = this.expressionMap.createAlias({
                 type: "join",