From d70799c9c46c4d453a42d9ab0b927acaee0aa971 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 4 Jan 2024 13:19:21 +0000 Subject: [PATCH] refactor: rename variable name to avoid duplicate var --- .../src/db/formulav2/formulaQueryBuilderv2.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts index c2166a2dc9..fe055a5a5d 100644 --- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts +++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts @@ -642,50 +642,50 @@ async function _formulaQueryBuilder( case UITypes.LastModifiedTime: case UITypes.DateTime: { - const col = await getRefColumnIfAlias(col); + const refCol = await getRefColumnIfAlias(col); if (knex.clientType().startsWith('mysql')) { - aliasToColumn[col.id] = async (): Promise => { + aliasToColumn[refCol.id] = async (): Promise => { return { // convert from DB timezone to UTC builder: knex.raw( `CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00')`, - [col.column_name], + [refCol.column_name], ), }; }; } else if ( knex.clientType() === 'pg' && - col.dt !== 'timestamp with time zone' && - col.dt !== 'timestamptz' + refCol.dt !== 'timestamp with time zone' && + refCol.dt !== 'timestamptz' ) { - aliasToColumn[col.id] = async (): Promise => { + aliasToColumn[refCol.id] = async (): Promise => { return { // convert from DB timezone to UTC builder: knex .raw( `?? AT TIME ZONE CURRENT_SETTING('timezone') AT TIME ZONE 'UTC'`, - [col.column_name], + [refCol.column_name], ) .wrap('(', ')'), }; }; } else if ( knex.clientType() === 'mssql' && - col.dt !== 'datetimeoffset' + refCol.dt !== 'datetimeoffset' ) { // convert from DB timezone to UTC - aliasToColumn[col.id] = async (): Promise => { + aliasToColumn[refCol.id] = async (): Promise => { return { builder: knex.raw( `CONVERT(DATETIMEOFFSET, ?? AT TIME ZONE 'UTC')`, - [col.column_name], + [refCol.column_name], ), }; }; } else { - aliasToColumn[col.id] = () => - Promise.resolve({ builder: col.column_name }); + aliasToColumn[refCol.id] = () => + Promise.resolve({ builder: refCol.column_name }); } } break;