archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

fix: overriding caching settings when alwaysEnabled is true (#9731)

Browse Source 
* 9023-2 Fix cache overriding option

* 9023-2 Fix format
This commit is contained in:
Pavel Kolpakov 2023-01-28 18:52:00 +04:00 committed by GitHub
parent ef64bfc6c5
commit 4df969ea62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/query-builder/SelectQueryBuilder.ts
View File

@ -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(
@ -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(