From 63635cdfd2a3c78d1a32171245f940892abb8b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?= Date: Tue, 24 Oct 2023 19:59:00 +0800 Subject: [PATCH] refactor(nocodb): use defaultLimitConfig from extractLimitAndOffset --- packages/nocodb/src/services/utils.service.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/nocodb/src/services/utils.service.ts b/packages/nocodb/src/services/utils.service.ts index 6e95c2006b..85a28bb1ff 100644 --- a/packages/nocodb/src/services/utils.service.ts +++ b/packages/nocodb/src/services/utils.service.ts @@ -14,6 +14,7 @@ import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2'; import { MetaTable } from '~/utils/globals'; import { jdbcToXcConfig } from '~/utils/nc-config/helpers'; import { packageVersion } from '~/utils/packageVersion'; +import { defaultLimitConfig } from '~/helpers/extractLimitAndOffset'; const versionCache = { releaseVersion: null, @@ -391,11 +392,8 @@ export class UtilsService { connectToExternalDB: !process.env.NC_CONNECT_TO_EXTERNAL_DB_DISABLED, version: packageVersion, defaultLimit: Math.max( - Math.min( - +process.env.DB_QUERY_LIMIT_DEFAULT || 25, - +process.env.DB_QUERY_LIMIT_MAX || 1000, - ), - +process.env.DB_QUERY_LIMIT_MIN || 1, + Math.min(defaultLimitConfig.limitDefault, defaultLimitConfig.limitMax), + defaultLimitConfig.limitMin, ), timezone: defaultConnectionConfig.timezone, ncMin: !!process.env.NC_MIN,