typeorm 0.3.20-dev.15de46f → 0.3.20-dev.4624930

package/browser/query-builder/SelectQueryBuilder.d.ts

@@ -504,17 +504,17 @@ export declare class SelectQueryBuilder<Entity extends ObjectLiteral> extends Qu
      */
     addOrderBy(sort: string, order?: "ASC" | "DESC", nulls?: "NULLS FIRST" | "NULLS LAST"): this;
     /**
-     * Set's LIMIT - maximum number of rows to be selected.
+     * Sets LIMIT - maximum number of rows to be selected.
      * NOTE that it may not work as you expect if you are using joins.
      * If you want to implement pagination, and you are having join in your query,
-     * then use instead take method instead.
+     * then use the take method instead.
      */
     limit(limit?: number): this;
     /**
-     * Set's OFFSET - selection offset.
+     * Sets OFFSET - selection offset.
      * NOTE that it may not work as you expect if you are using joins.
      * If you want to implement pagination, and you are having join in your query,
-     * then use instead skip method instead.
+     * then use the skip method instead.
      */
     offset(offset?: number): this;
     /**

package/browser/query-builder/SelectQueryBuilder.js

@@ -541,10 +541,10 @@ export class SelectQueryBuilder extends QueryBuilder {
         return this;
     }
     /**
-     * Set's LIMIT - maximum number of rows to be selected.
+     * Sets LIMIT - maximum number of rows to be selected.
      * NOTE that it may not work as you expect if you are using joins.
      * If you want to implement pagination, and you are having join in your query,
-     * then use instead take method instead.
+     * then use the take method instead.
      */
     limit(limit) {
         this.expressionMap.limit = this.normalizeNumber(limit);
@@ -554,10 +554,10 @@ export class SelectQueryBuilder extends QueryBuilder {
         return this;
     }
     /**
-     * Set's OFFSET - selection offset.
+     * Sets OFFSET - selection offset.
      * NOTE that it may not work as you expect if you are using joins.
      * If you want to implement pagination, and you are having join in your query,
-     * then use instead skip method instead.
+     * then use the skip method instead.
      */
     offset(offset) {
         this.expressionMap.offset = this.normalizeNumber(offset);
@@ -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;
     }
 }