typeorm 0.3.20-dev.8ebe769 → 0.3.20-dev.8f371f2

package/browser/query-builder/SelectQueryBuilder.js

@@ -2059,7 +2059,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                 const relations = Array.isArray(this.findOptions.relations)
                     ? OrmUtils.propertyPathsToTruthyObject(this.findOptions.relations)
                     : this.findOptions.relations;
-                const queryBuilder = this.createQueryBuilder()
+                const queryBuilder = this.createQueryBuilder(queryRunner)
                     .select(relationAlias)
                     .from(relationTarget, relationAlias)
                     .setFindOptions({
@@ -2450,16 +2450,13 @@ export class SelectQueryBuilder extends QueryBuilder {
         // let parameterIndex = Object.keys(this.expressionMap.nativeParameters).length;
         if (Array.isArray(where)) {
             if (where.length) {
-                condition =
-                    "(" +
-                        where
-                            .map((whereItem) => {
-                            return this.buildWhere(whereItem, metadata, alias, embedPrefix);
-                        })
-                            .filter((condition) => !!condition)
-                            .map((condition) => "(" + condition + ")")
-                            .join(" OR ") +
-                        ")";
+                condition = where
+                    .map((whereItem) => {
+                    return this.buildWhere(whereItem, metadata, alias, embedPrefix);
+                })
+                    .filter((condition) => !!condition)
+                    .map((condition) => "(" + condition + ")")
+                    .join(" OR ");
             }
         }
         else {
@@ -2642,9 +2639,11 @@ export class SelectQueryBuilder extends QueryBuilder {
                     }
                 }
             }
-            condition = andConditions.join(" AND ");
+            condition = andConditions.length
+                ? "(" + andConditions.join(") AND (") + ")"
+                : andConditions.join(" AND ");
         }
-        return condition;
+        return condition.length ? "(" + condition + ")" : condition;
     }
 }