github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

feat: `CreateTime` or `LastModifiedTime` - select query - singleQuery

pull/7304/head
Pranav C 12 months ago
parent
68b0bea705
commit
d000252ac1
1 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      packages/nocodb/src/db/BaseModelSqlv2.ts

88
packages/nocodb/src/db/BaseModelSqlv2.ts
Unescape View File

@ -2126,55 +2126,55 @@ class BaseModelSqlv2 {
switch (column.uidt) { switch (column.uidt) {
case UITypes.CreateTime: case UITypes.CreateTime:
case UITypes.LastModifiedTime: case UITypes.LastModifiedTime:
case UITypes.DateTime: { case UITypes.DateTime:
const columnName = getColumnName(column) ; {
if (this.isMySQL) { const columnName = getColumnName(column);
// MySQL stores timestamp in UTC but display in timezone if (this.isMySQL) {
// To verify the timezone, run `SELECT @@global.time_zone, @@session.time_zone;` // MySQL stores timestamp in UTC but display in timezone
// If it's SYSTEM, then the timezone is read from the configuration file // To verify the timezone, run `SELECT @@global.time_zone, @@session.time_zone;`
// if a timezone is set in a DB, the retrieved value would be converted to the corresponding timezone // If it's SYSTEM, then the timezone is read from the configuration file
// for example, let's say the global timezone is +08:00 in DB // if a timezone is set in a DB, the retrieved value would be converted to the corresponding timezone
// the value 2023-01-01 10:00:00 (UTC) would display as 2023-01-01 18:00:00 (UTC+8) // for example, let's say the global timezone is +08:00 in DB
// our existing logic is based on UTC, during the query, we need to take the UTC value // the value 2023-01-01 10:00:00 (UTC) would display as 2023-01-01 18:00:00 (UTC+8)
// hence, we use CONVERT_TZ to convert back to UTC value // our existing logic is based on UTC, during the query, we need to take the UTC value
res[sanitize(column.id || column.column_name)] = this.dbDriver.raw( // hence, we use CONVERT_TZ to convert back to UTC value
`CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00')`, res[sanitize(column.id || columnName)] = this.dbDriver.raw(
[`${sanitize(alias || this.tnPath)}.${column.column_name}`], `CONVERT_TZ(??, @@GLOBAL.time_zone, '+00:00')`,
); [`${sanitize(alias || this.tnPath)}.${columnName}`],
break; );
} else if (this.isPg) {
// if there is no timezone info,
// convert to database timezone,
// then convert to UTC
if (
column.dt !== 'timestamp with time zone' &&
column.dt !== 'timestamptz'
) {
res[sanitize(column.id || column.column_name)] = this.dbDriver
.raw(
`?? AT TIME ZONE CURRENT_SETTING('timezone') AT TIME ZONE 'UTC'`,
[`${sanitize(alias || this.tnPath)}.${column.column_name}`],
)
.wrap('(', ')');
break; break;
} } else if (this.isPg) {
} else if (this.isMssql) { // if there is no timezone info,
// if there is no timezone info, // convert to database timezone,
// convert to database timezone, // then convert to UTC
// then convert to UTC if (
if (column.dt !== 'datetimeoffset') { column.dt !== 'timestamp with time zone' &&
res[sanitize(column.id || column.column_name)] = column.dt !== 'timestamptz'
this.dbDriver.raw( ) {
res[sanitize(column.id || columnName)] = this.dbDriver
.raw(
`?? AT TIME ZONE CURRENT_SETTING('timezone') AT TIME ZONE 'UTC'`,
[`${sanitize(alias || this.tnPath)}.${columnName}`],
)
.wrap('(', ')');
break;
}
} else if (this.isMssql) {
// if there is no timezone info,
// convert to database timezone,
// then convert to UTC
if (column.dt !== 'datetimeoffset') {
res[sanitize(column.id || columnName)] = this.dbDriver.raw(
`CONVERT(DATETIMEOFFSET, ?? AT TIME ZONE 'UTC')`, `CONVERT(DATETIMEOFFSET, ?? AT TIME ZONE 'UTC')`,
[`${sanitize(alias || this.tnPath)}.${column.column_name}`], [`${sanitize(alias || this.tnPath)}.${columnName}`],
); );
break; break;
}
} }
res[sanitize(column.id || columnName)] = sanitize(
`${alias || this.tnPath}.${columnName}`,
);
} }
res[sanitize(column.id || column.column_name)] = sanitize(
`${alias || this.tnPath}.${column.column_name}`,
);
}
break; break;
case UITypes.LinkToAnotherRecord: case UITypes.LinkToAnotherRecord:
case UITypes.Lookup: case UITypes.Lookup:

Write Preview
Loading…
Cancel
Save