From 886c4898d8b128105ef4a98f8544807238de5c6c Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Wed, 30 Sep 2020 19:03:41 +0530 Subject: [PATCH] MM-28548: Change default data source to postgres (#15553) * MM-28548: Change default data source to postgres We now move to start using postgres as our default database. * Add connect_timeout * Trigger CI Co-authored-by: Mattermod --- model/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/config.go b/model/config.go index 7d46ad318b..69b31eb8a6 100644 --- a/model/config.go +++ b/model/config.go @@ -107,7 +107,7 @@ const ( TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT = "" TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT = 300 - SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s" + SQL_SETTINGS_DEFAULT_DATA_SOURCE = "postgres://mmuser:mostest@localhost/mattermost_test?sslmode=disable&connect_timeout=10" FILE_SETTINGS_DEFAULT_DIRECTORY = "./data/" @@ -1033,7 +1033,7 @@ type SqlSettings struct { func (s *SqlSettings) SetDefaults(isUpdate bool) { if s.DriverName == nil { - s.DriverName = NewString(DATABASE_DRIVER_MYSQL) + s.DriverName = NewString(DATABASE_DRIVER_POSTGRES) } if s.DataSource == nil {