Skip to content

Commit 7f833d8

Browse files
GiteaBotwxiaoguang
andauthored
Fix panic when parsing empty pgsql host (#28708) (#28709)
Backport #28708 by wxiaoguang Regression of #27723 Fix #28705 Co-authored-by: wxiaoguang <[email protected]>
1 parent e67c819 commit 7f833d8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

modules/setting/database.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func getPostgreSQLConnectionString(dbHost, dbUser, dbPasswd, dbName, dbsslMode s
168168
RawQuery: dbParam,
169169
}
170170
query := connURL.Query()
171-
if dbHost[0] == '/' { // looks like a unix socket
171+
if strings.HasPrefix(dbHost, "/") { // looks like a unix socket
172172
query.Add("host", dbHost)
173173
connURL.Host = ":" + port
174174
}

modules/setting/database_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ func Test_getPostgreSQLConnectionString(t *testing.T) {
6565
SSLMode string
6666
Output string
6767
}{
68+
{
69+
Host: "", // empty means default
70+
Output: "postgres://:@127.0.0.1:5432?sslmode=",
71+
},
6872
{
6973
Host: "/tmp/pg.sock",
7074
User: "testuser",

0 commit comments

Comments
 (0)