Merge pull request #6796 from nocodb/fix/limit

fix(nocodb): config limit

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -64,6 +64,7 @@ import {
   IS_WITHIN_COMPARISON_SUB_OPS,
 } from '~/utils/globals';
 import { extractProps } from '~/helpers/extractProps';
+import { defaultLimitConfig } from '~/helpers/extractLimitAndOffset';
 
 dayjs.extend(utc);
 
@@ -110,11 +111,7 @@ class BaseModelSqlv2 {
   protected _proto: any;
   protected _columns = {};
 
-  public static config: any = {
-    limitDefault: Math.max(+process.env.DB_QUERY_LIMIT_DEFAULT || 25, 1),
-    limitMin: Math.max(+process.env.DB_QUERY_LIMIT_MIN || 1, 1),
-    limitMax: Math.max(+process.env.DB_QUERY_LIMIT_MAX || 1000, 1),
-  };
+  public static config: any = defaultLimitConfig;
 
   public get dbDriver() {
     return this._dbDriver;

packages/nocodb/src/helpers/extractLimitAndOffset.ts

@@ -1,4 +1,4 @@
-const config = {
+export const defaultLimitConfig = {
   limitDefault: Math.max(+process.env.DB_QUERY_LIMIT_DEFAULT || 25, 1),
   limitMin: Math.max(+process.env.DB_QUERY_LIMIT_MIN || 1, 1),
   limitMax: Math.max(+process.env.DB_QUERY_LIMIT_MAX || 1000, 1),
@@ -25,10 +25,10 @@ export function extractLimitAndOffset(
     Math.min(
       limit && limit > 0 && Number.isInteger(limit)
         ? limit
-        : config.limitDefault,
-      config.limitMax,
+        : defaultLimitConfig.limitDefault,
+      defaultLimitConfig.limitMax,
     ),
-    config.limitMin,
+    defaultLimitConfig.limitMin,
   );
 
   // skip any invalid offset, ignore negative and non-integer values

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 || 100,
-        ),
-        +process.env.DB_QUERY_LIMIT_MIN || 1,
+        Math.min(defaultLimitConfig.limitDefault, defaultLimitConfig.limitMax),
+        defaultLimitConfig.limitMin,
       ),
       timezone: defaultConnectionConfig.timezone,
       ncMin: !!process.env.NC_MIN,