From b7c6ec91bac5ab0a5382f99a72753574dbc41745 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 13 Jul 2022 05:33:31 +0000 Subject: [PATCH] Use default values when provided values are empty (#20318) * Use default values when provided values are empty - When provided values are empty like `:3000` would imply that host is empty, use the default value. - Resolves #20316 * Update database.go Co-authored-by: Lunny Xiao Co-authored-by: wxiaoguang --- modules/setting/database.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/setting/database.go b/modules/setting/database.go index 87d56fbc9..8fdd5f2bc 100644 --- a/modules/setting/database.go +++ b/modules/setting/database.go @@ -156,6 +156,12 @@ func parsePostgreSQLHostPort(info string) (string, string) { } else if len(info) > 0 { host = info } + if host == "" { + host = "127.0.0.1" + } + if port == "" { + port = "5432" + } return host, port } @@ -173,6 +179,7 @@ func getPostgreSQLConnectionString(dbHost, dbUser, dbPasswd, dbName, dbParam, db // ParseMSSQLHostPort splits the host into host and port func ParseMSSQLHostPort(info string) (string, string) { + // the default port "0" might be related to MSSQL's dynamic port, maybe it should be double-confirmed in the future host, port := "127.0.0.1", "0" if strings.Contains(info, ":") { host = strings.Split(info, ":")[0] @@ -183,5 +190,11 @@ func ParseMSSQLHostPort(info string) (string, string) { } else if len(info) > 0 { host = info } + if host == "" { + host = "127.0.0.1" + } + if port == "" { + port = "0" + } return host, port }