Browse Source

fix: Set timezone as UTC by default

re #483

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/498/head
Pranav C 3 years ago
parent
commit
5f92e4eab7
  1. 14
      packages/nocodb/src/lib/utils/NcConfigFactory.ts

14
packages/nocodb/src/lib/utils/NcConfigFactory.ts

@ -22,6 +22,11 @@ const defaultClientPortMapping = {
mssql: 1433, mssql: 1433,
} }
const defaultConnectionConfig ={
timezone: 'UTC',
dateStrings: true
}
export default class NcConfigFactory implements NcConfig { export default class NcConfigFactory implements NcConfig {
@ -210,7 +215,7 @@ export default class NcConfigFactory implements NcConfig {
client: 'sqlite3', client: 'sqlite3',
"connection": { "connection": {
"client": "sqlite3", "client": "sqlite3",
"connection": { "connection": {
"filename": url.searchParams.get('d') || url.searchParams.get('database') "filename": url.searchParams.get('d') || url.searchParams.get('database')
}, },
"database": url.searchParams.get('d') || url.searchParams.get('database'), "database": url.searchParams.get('d') || url.searchParams.get('database'),
@ -221,6 +226,7 @@ export default class NcConfigFactory implements NcConfig {
dbConfig = { dbConfig = {
client: url.protocol.replace(':', ''), client: url.protocol.replace(':', ''),
"connection": { "connection": {
...defaultConnectionConfig,
database: url.searchParams.get('d') || url.searchParams.get('database'), database: url.searchParams.get('d') || url.searchParams.get('database'),
"host": url.hostname, "host": url.hostname,
"password": url.searchParams.get('p') || url.searchParams.get('password'), "password": url.searchParams.get('p') || url.searchParams.get('password'),
@ -307,6 +313,7 @@ export default class NcConfigFactory implements NcConfig {
dbConfig = { dbConfig = {
client: url.protocol.replace(':', ''), client: url.protocol.replace(':', ''),
"connection": { "connection": {
...defaultConnectionConfig,
database: url.searchParams.get('d') || url.searchParams.get('database'), database: url.searchParams.get('d') || url.searchParams.get('database'),
"host": url.hostname, "host": url.hostname,
"password": url.searchParams.get('p') || url.searchParams.get('password'), "password": url.searchParams.get('p') || url.searchParams.get('password'),
@ -616,6 +623,11 @@ export default class NcConfigFactory implements NcConfig {
// } // }
} }
export {
defaultConnectionConfig
}
/** /**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd * @copyright Copyright (c) 2021, Xgene Cloud Ltd
* *

Loading…
Cancel
Save