Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use default values when provided values are empty #20318

Merged
merged 5 commits into from
Jul 13, 2022
Merged

Use default values when provided values are empty #20318

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
372b8f0
Use default values when provided values are empty
Jul 11, 2022
b83b8bf
Merge branch 'main' into use-default
lunny Jul 11, 2022
b6f698a
Merge branch 'main' into use-default
Jul 12, 2022
a9584a1
Update database.go
wxiaoguang Jul 13, 2022
4a89bc2
Merge branch 'main' into use-default
wxiaoguang Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions modules/setting/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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]
Expand All @@ -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"
lunny marked this conversation as resolved.
Show resolved Hide resolved
}
return host, port
}