typeorm 0.3.11-dev.6eb674b → 0.3.11-dev.7fbc3ad

package/query-builder/SelectQueryBuilder.js

@@ -1868,9 +1868,9 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 .offset(this.expressionMap.skip)
                 .limit(this.expressionMap.take)
                 .orderBy(orderBys)
-                .cache(this.expressionMap.cache
-                ? this.expressionMap.cache
-                : this.expressionMap.cacheId, this.expressionMap.cacheDuration)
+                .cache(this.expressionMap.cache && this.expressionMap.cacheId
+                ? `${this.expressionMap.cacheId}-pagination`
+                : this.expressionMap.cache, this.expressionMap.cacheDuration)
                 .setParameters(this.getParameters())
                 .setNativeParameters(this.expressionMap.nativeParameters)
                 .getRawMany();
@@ -2468,7 +2468,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         const existJoin = this.joins.find((join) => join.alias === joinAlias);
                         if (!existJoin) {
                             this.joins.push({
-                                type: "inner",
+                                type: "left",
                                 select: false,
                                 selection: undefined,
                                 alias: joinAlias,
@@ -2476,10 +2476,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                                 relationMetadata: relation,
                             });
                         }
-                        else {
-                            if (existJoin.type === "left")
-                                existJoin.type = "inner";
-                        }
                         const condition = this.buildWhere(where[key], relation.inverseEntityMetadata, joinAlias);
                         if (condition) {
                             andConditions.push(condition);