Browse Source

fix(nocodb): sqlite xcdb / extdb logic

pull/5642/head
Wing-Kam Wong 2 years ago
parent
commit
fb98716ce7
  1. 11
      packages/nocodb/src/models/Model.ts

11
packages/nocodb/src/models/Model.ts

@ -483,11 +483,8 @@ export default class Model implements TableType {
// e.g. 2022-01-01 20:00:00+08:00 -> 2022-01-01 20:00:00 // e.g. 2022-01-01 20:00:00+08:00 -> 2022-01-01 20:00:00
val = dayjs(val).format('YYYY-MM-DD HH:mm:ss'); val = dayjs(val).format('YYYY-MM-DD HH:mm:ss');
} else if (isSqlite) { } else if (isSqlite) {
// e.g. 2023-05-10T10:38:50.000Z -> 2023-05-10 10:38:50 // e.g. 2022-01-01T10:00:00.000Z -> 2022-01-01 10:00:00
val = dayjs val = dayjs(val).utc().format('YYYY-MM-DD HH:mm:ss');
.utc(val)
.utcOffset(d.getTimezoneOffset(), true)
.format('YYYY-MM-DD HH:mm:ss');
} else if (isPg) { } else if (isPg) {
// e.g. 2023-01-01T12:00:00.000Z -> 2023-01-01 20:00:00+08:00 // e.g. 2023-01-01T12:00:00.000Z -> 2023-01-01 20:00:00+08:00
val = dayjs(val).format('YYYY-MM-DD HH:mm:ssZ'); val = dayjs(val).format('YYYY-MM-DD HH:mm:ssZ');
@ -507,7 +504,9 @@ export default class Model implements TableType {
// e.g. 2022-01-01 20:00:00Z -> 2022-01-02 04:00:00 // e.g. 2022-01-01 20:00:00Z -> 2022-01-02 04:00:00
// e.g. 2022-01-01 20:00:00+00:00 -> 2022-01-02 04:00:00 // e.g. 2022-01-01 20:00:00+00:00 -> 2022-01-02 04:00:00
val = dayjs(val).format('YYYY-MM-DD HH:mm:ss'); val = dayjs(val).format('YYYY-MM-DD HH:mm:ss');
} else if (isSqlite || isMssql) { } else if (isSqlite) {
val = dayjs(val).utc().format('YYYY-MM-DD HH:mm:ss');
} else if (isMssql) {
if (val.slice(-1) === 'Z') { if (val.slice(-1) === 'Z') {
// from UI // from UI
val = dayjs(val).utc().format('YYYY-MM-DD HH:mm:ssZ'); val = dayjs(val).utc().format('YYYY-MM-DD HH:mm:ssZ');

Loading…
Cancel
Save