typeorm 0.3.26-dev.01dddfe → 0.3.26-dev.5904ac3

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

@@ -588,6 +588,7 @@ export declare class SelectQueryBuilder<Entity extends ObjectLiteral> extends Qu
      * This method is useful to build pagination.
      */
     getManyAndCount(): Promise<[Entity[], number]>;
+    private lazyCount;
     /**
      * Executes built SQL query and returns raw data stream.
      */

package/browser/query-builder/SelectQueryBuilder.js

@@ -846,11 +846,16 @@ export class SelectQueryBuilder extends QueryBuilder {
             this.expressionMap.queryEntity = true;
             const entitiesAndRaw = await this.executeEntitiesAndRawResults(queryRunner);
             this.expressionMap.queryEntity = false;
-            const cacheId = this.expressionMap.cacheId;
-            // Creates a new cacheId for the count query, or it will retreive the above query results
-            // and count will return 0.
-            this.expressionMap.cacheId = cacheId ? `${cacheId}-count` : cacheId;
-            const count = await this.executeCountQuery(queryRunner);
+            let count = this.lazyCount(entitiesAndRaw);
+            if (count === undefined) {
+                const cacheId = this.expressionMap.cacheId;
+                // Creates a new cacheId for the count query, or it will retrieve the above query results
+                // and count will return 0.
+                if (cacheId) {
+                    this.expressionMap.cacheId = `${cacheId}-count`;
+                }
+                count = await this.executeCountQuery(queryRunner);
+            }
             const results = [entitiesAndRaw.entities, count];
             // close transaction if we started it
             if (transactionStartedByUs) {
@@ -874,6 +879,39 @@ export class SelectQueryBuilder extends QueryBuilder {
                 await queryRunner.release();
         }
     }
+    lazyCount(entitiesAndRaw) {
+        const hasLimit = this.expressionMap.limit !== undefined &&
+            this.expressionMap.limit !== null;
+        if (this.expressionMap.joinAttributes.length > 0 && hasLimit) {
+            return undefined;
+        }
+        const hasTake = this.expressionMap.take !== undefined &&
+            this.expressionMap.take !== null;
+        // limit overrides take when no join is defined
+        const maxResults = hasLimit
+            ? this.expressionMap.limit
+            : hasTake
+                ? this.expressionMap.take
+                : undefined;
+        if (maxResults !== undefined &&
+            entitiesAndRaw.entities.length === maxResults) {
+            // stop here when the result set contains the max number of rows; we need to execute a full count
+            return undefined;
+        }
+        const hasSkip = this.expressionMap.skip !== undefined &&
+            this.expressionMap.skip !== null &&
+            this.expressionMap.skip > 0;
+        const hasOffset = this.expressionMap.offset !== undefined &&
+            this.expressionMap.offset !== null &&
+            this.expressionMap.offset > 0;
+        // offset overrides skip when no join is defined
+        const previousResults = hasOffset
+            ? this.expressionMap.offset
+            : hasSkip
+                ? this.expressionMap.skip
+                : 0;
+        return entitiesAndRaw.entities.length + previousResults;
+    }
     /**
      * Executes built SQL query and returns raw data stream.
      */