Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/group/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func getBackendDBUri() string {
// Set collation instead of charset, if BackendMySQLCollation is specified
dsnCharsetCollation = fmt.Sprintf("collation=%s", config.Settings().BackendMySQLCollation)
}
return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?interpolateParams=true&%s&timeout=500ms",
return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?interpolateParams=true&%s&timeout=1s",
Comment thread
meiji163 marked this conversation as resolved.
Outdated
config.Settings().BackendMySQLUser,
config.Settings().BackendMySQLPassword,
config.Settings().BackendMySQLHost,
Expand Down
4 changes: 2 additions & 2 deletions pkg/group/mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ func TestGetBackendDBUri(t *testing.T) {

// test default (charset)
dbUri := getBackendDBUri()
test.S(t).ExpectEquals(dbUri, "gromit:penguin@tcp(myhost:3306)/test_database?interpolateParams=true&charset=utf8mb4,utf8,latin1&timeout=500ms")
test.S(t).ExpectEquals(dbUri, "gromit:penguin@tcp(myhost:3306)/test_database?interpolateParams=true&charset=utf8mb4,utf8,latin1&timeout=1s")

// test setting collation
config.Settings().BackendMySQLCollation = "utf8mb4_unicode_ci"
dbUri = getBackendDBUri()
test.S(t).ExpectEquals(dbUri, "gromit:penguin@tcp(myhost:3306)/test_database?interpolateParams=true&collation=utf8mb4_unicode_ci&timeout=500ms")
test.S(t).ExpectEquals(dbUri, "gromit:penguin@tcp(myhost:3306)/test_database?interpolateParams=true&collation=utf8mb4_unicode_ci&timeout=1s")
}
Loading