meta/pg:fix pg socket connection (#2607)

juicedata · Aug 26, 2022 · bb84127 · bb84127
1 parent 42c66bc
commit bb84127
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/docs/en/guide/how_to_set_up_metadata_engine.md b/docs/en/guide/how_to_set_up_metadata_engine.md
@@ -142,14 +142,14 @@ When using PostgreSQL as the metadata storage engine, you need to create a datab
   <TabItem value="tcp" label="TCP">
 
 ```
-postgres://<username>[:<password>]@<host>[:5432]/<database-name>[?parameters]
+postgres://[username][:<password>]@<host>[:5432]/<database-name>[?parameters]
 ```
 
   </TabItem>
   <TabItem value="unix-socket" label="Unix socket">
 
 ```
-postgres:///<database-name>?host=<socket-directories-path>[&user=<user>&password=<password>]
+postgres://[username][:<password>]@/<database-name>?host=<socket-directories-path>[&parameters]
 ```
 
   </TabItem>

diff --git a/docs/zh_cn/guide/how_to_set_up_metadata_engine.md b/docs/zh_cn/guide/how_to_set_up_metadata_engine.md
@@ -142,14 +142,14 @@ KeyDB 的数据复制是异步的，使用 Active Active（双活）功能可能
   <TabItem value="tcp" label="TCP">
 
 ```
-postgres://<username>[:<password>]@<host>[:5432]/<database-name>[?parameters]
+postgres://[username][:<password>]@<host>[:5432]/<database-name>[?parameters]
 ```
 
   </TabItem>
   <TabItem value="unix-socket" label="Unix socket">
 
 ```
-postgres:///<database-name>?host=<socket-directories-path>[&user=<user>&password=<password>]
+postgres://[username][:<password>]@/<database-name>?host=<socket-directories-path>[&parameters]
 ```
 
   </TabItem>

diff --git a/pkg/meta/interface.go b/pkg/meta/interface.go
@@ -378,7 +378,7 @@ func setPasswordFromEnv(uri string) (string, error) {
 	dIndex := strings.Index(uri, "://") + 3
 	s := strings.Split(uri[dIndex:atIndex], ":")
 
-	if len(s) > 2 || s[0] == "" {
+	if len(s) > 2 {
 		return "", fmt.Errorf("invalid uri: %s", uri)
 	}
 

diff --git a/pkg/meta/interface_test.go b/pkg/meta/interface_test.go
@@ -41,13 +41,14 @@ func Test_setPasswordFromEnv(t *testing.T) {
 			args: "mysql://root@(127.0.0.1:3306)/juicefs",
 			want: "mysql://root:dbPasswd@(127.0.0.1:3306)/juicefs",
 		},
+		// no user is ok
 		{
-			args: "mysql://(127.0.0.1:3306)/juicefs",
-			want: "",
+			args: "mysql://:@(127.0.0.1:3306)/juicefs",
+			want: "mysql://:dbPasswd@(127.0.0.1:3306)/juicefs",
 		},
 		{
 			args: "mysql://:pwd@(127.0.0.1:3306)/juicefs",
-			want: "",
+			want: "mysql://:pwd@(127.0.0.1:3306)/juicefs",
 		},
 		{
 			args: "mysql://a:b:c:@(127.0.0.1:3306)/juicefs",
@@ -66,6 +67,14 @@ func Test_setPasswordFromEnv(t *testing.T) {
 			args: "postgres://[email protected]:5432/juicefs",
 			want: "postgres://root:[email protected]:5432/juicefs",
 		},
+		{
+			args: "postgres://root@/pgtest?host=/tmp/pgsocket/&port=5433",
+			want: "postgres://root:dbPasswd@/pgtest?host=/tmp/pgsocket/&port=5433",
+		},
+		{
+			args: "postgres://@/pgtest?host=/tmp/pgsocket/&port=5433&user=pguser",
+			want: "postgres://:dbPasswd@/pgtest?host=/tmp/pgsocket/&port=5433&user=pguser",
+		},
 	}
 	for _, tt := range tests {
 		t.Run("", func(t *testing.T) {