Skip to content

fix: overriding caching settings when alwaysEnabled is true #9731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexMesser merged 2 commits into from
Jan 28, 2023
Merged

fix: overriding caching settings when alwaysEnabled is true #9731

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e30b00
9023-2 Fix cache overriding option
kolpakov-p Jan 24, 2023
8d55fef
9023-2 Fix format
kolpakov-p Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/query-builder/SelectQueryBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3685,11 +3685,13 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
: {}
let savedQueryResultCacheOptions: QueryResultCacheOptions | undefined =
undefined
const isCachingEnabled =
// Caching is enabled globally and isn't disabled locally.
(cacheOptions.alwaysEnabled && this.expressionMap.cache) ||
// ...or it's enabled locally explicitly.
this.expressionMap.cache
let cacheError = false
if (
this.connection.queryResultCache &&
(this.expressionMap.cache || cacheOptions.alwaysEnabled)
) {
if (this.connection.queryResultCache && isCachingEnabled) {
try {
savedQueryResultCacheOptions =
await this.connection.queryResultCache.getFromCache(
Expand Down Expand Up @@ -3724,7 +3726,7 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
if (
!cacheError &&
this.connection.queryResultCache &&
(this.expressionMap.cache || cacheOptions.alwaysEnabled)
isCachingEnabled
) {
try {
await this.connection.queryResultCache.storeInCache(
Expand Down