Merge branch 'main' into random-test-cmd

juicedata · Apr 19, 2024 · c539178 · c539178
2 parents ec36a96 + 6494d30
commit c539178
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/object/object_storage_test.go b/pkg/object/object_storage_test.go
@@ -926,7 +926,7 @@ func TestPG(t *testing.T) { //skip mutate
 
 }
 func TestPGWithSearchPath(t *testing.T) { //skip mutate
-	_, err := newSQLStore("postgres", "localhost:5432/test?sslmode=disable&search_path=juicefs,public", "", "")
+	_, err := newSQLStore("postgres", "127.0.0.1:5432/test?sslmode=disable&search_path=juicefs,public", "", "")
 	if !strings.Contains(err.Error(), "currently, only one schema is supported in search_path") {
 		t.Fatalf("TestPGWithSearchPath error: %s", err)
 	}

diff --git a/pkg/object/sql.go b/pkg/object/sql.go
@@ -168,9 +168,9 @@ func newSQLStore(driver, addr, user, password string) (ObjectStorage, error) {
 		uri = "postgres://" + uri
 		driver = "pgx"
 
-		parse, err := url.Parse(addr)
+		parse, err := url.Parse(uri)
 		if err != nil {
-			return nil, fmt.Errorf("parse url %s failed: %s", addr, err)
+			return nil, fmt.Errorf("parse url %s failed: %s", uri, err)
 		}
 		searchPath = parse.Query().Get("search_path")
 		if searchPath != "" {