Move bookmark default port parsing to readServerConfig func

akarki15 · Nov 16, 2016 · 0510634 · 0510634
1 parent 5901828
commit 0510634
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/bookmarks/bookmarks.go b/pkg/bookmarks/bookmarks.go
@@ -49,6 +49,11 @@ func readServerConfig(path string) (Bookmark, error) {
 	}
 
 	_, err = toml.Decode(string(buff), &bookmark)
+
+	if bookmark.Port == 0 {
+		bookmark.Port = 5432
+	}
+
 	return bookmark, err
 }
 
@@ -101,9 +106,5 @@ func GetBookmark(bookmarkPath string, bookmarkName string) (Bookmark, error) {
 		return Bookmark{}, fmt.Errorf("couldn't find a bookmark with name %s", bookmarkName)
 	}
 
-	if bookmark.Port == 0 {
-		bookmark.Port = 5432
-	}
-
 	return bookmark, nil
 }
diff --git a/pkg/bookmarks/bookmarks_test.go b/pkg/bookmarks/bookmarks_test.go
@@ -36,7 +36,7 @@ func Test_Bookmark_URL(t *testing.T) {
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "postgres://username:password@host:port/database?sslmode=disable", bookmark.Url)
 	assert.Equal(t, "", bookmark.Host)
-	assert.Equal(t, 0, bookmark.Port)
+	assert.Equal(t, 5432, bookmark.Port)
 	assert.Equal(t, "", bookmark.User)
 	assert.Equal(t, "", bookmark.Database)
 	assert.Equal(t, "", bookmark.Ssl)