Browse Source

refactor: rename variable name to avoid duplicate var

pull/7304/head
Pranav C 10 months ago
parent
commit
d70799c9c4
  1. 24
      packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts

24
packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts

@ -642,50 +642,50 @@ async function _formulaQueryBuilder(
case UITypes.LastModifiedTime: case UITypes.LastModifiedTime:
case UITypes.DateTime: case UITypes.DateTime:
{ {
const col = await getRefColumnIfAlias(col); const refCol = await getRefColumnIfAlias(col);
if (knex.clientType().startsWith('mysql')) { if (knex.clientType().startsWith('mysql')) {
aliasToColumn[col.id] = async (): Promise<any> => { aliasToColumn[refCol.id] = async (): Promise<any> => {
return { return {
// convert from DB timezone to UTC // convert from DB timezone to UTC
builder: knex.raw( builder: knex.raw(
`CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00')`, `CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00')`,
[col.column_name], [refCol.column_name],
), ),
}; };
}; };
} else if ( } else if (
knex.clientType() === 'pg' && knex.clientType() === 'pg' &&
col.dt !== 'timestamp with time zone' && refCol.dt !== 'timestamp with time zone' &&
col.dt !== 'timestamptz' refCol.dt !== 'timestamptz'
) { ) {
aliasToColumn[col.id] = async (): Promise<any> => { aliasToColumn[refCol.id] = async (): Promise<any> => {
return { return {
// convert from DB timezone to UTC // convert from DB timezone to UTC
builder: knex builder: knex
.raw( .raw(
`?? AT TIME ZONE CURRENT_SETTING('timezone') AT TIME ZONE 'UTC'`, `?? AT TIME ZONE CURRENT_SETTING('timezone') AT TIME ZONE 'UTC'`,
[col.column_name], [refCol.column_name],
) )
.wrap('(', ')'), .wrap('(', ')'),
}; };
}; };
} else if ( } else if (
knex.clientType() === 'mssql' && knex.clientType() === 'mssql' &&
col.dt !== 'datetimeoffset' refCol.dt !== 'datetimeoffset'
) { ) {
// convert from DB timezone to UTC // convert from DB timezone to UTC
aliasToColumn[col.id] = async (): Promise<any> => { aliasToColumn[refCol.id] = async (): Promise<any> => {
return { return {
builder: knex.raw( builder: knex.raw(
`CONVERT(DATETIMEOFFSET, ?? AT TIME ZONE 'UTC')`, `CONVERT(DATETIMEOFFSET, ?? AT TIME ZONE 'UTC')`,
[col.column_name], [refCol.column_name],
), ),
}; };
}; };
} else { } else {
aliasToColumn[col.id] = () => aliasToColumn[refCol.id] = () =>
Promise.resolve({ builder: col.column_name }); Promise.resolve({ builder: refCol.column_name });
} }
} }
break; break;

Loading…
Cancel
Save