balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Remove error return value from ConvertToOptions

Browse Source 
ConvertToOptions can't return any error.
This commit is contained in:
akarki15 2016-11-15 22:03:32 -05:00
parent b1fdbf714b
commit fedde804e3
4 changed files with 197 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.go
View File

@ -30,10 +30,7 @@ func initClientUsingBookmark(bookmarkPath, bookmarkName string) (*client.Client,
if err != nil { if err != nil {
return nil, err return nil, err
} }
opt, err := bookmark.ConvertToOptions() opt := bookmark.ConvertToOptions()
if err != nil {
return nil, err
}
var connStr string var connStr string
if opt.Url != "" { // if the bookmark has url set, use it if opt.Url != "" { // if the bookmark has url set, use it
connStr = opt.Url connStr = opt.Url

4
pkg/bookmarks/bookmarks.go
View File

@ -28,7 +28,7 @@ func (b Bookmark) SSHInfoIsEmpty() bool {
return b.Ssh.User == "" && b.Ssh.Host == "" && b.Ssh.Port == "" return b.Ssh.User == "" && b.Ssh.Host == "" && b.Ssh.Port == ""
} }
func (b Bookmark) ConvertToOptions() (command.Options, error) { func (b Bookmark) ConvertToOptions() command.Options {
return command.Options{ return command.Options{
Url: b.Url, Url: b.Url,
Host: b.Host, Host: b.Host,
@ -37,7 +37,7 @@ func (b Bookmark) ConvertToOptions() (command.Options, error) {
Pass: b.Password, Pass: b.Password,
DbName: b.Database, DbName: b.Database,
Ssl: b.Ssl, Ssl: b.Ssl,
}, nil }
} }
func readServerConfig(path string) (Bookmark, error) { func readServerConfig(path string) (Bookmark, error) {

6
pkg/bookmarks/bookmarks_test.go
View File

@ -130,8 +130,6 @@ func Test_ConvertToOptions(t *testing.T) {
DbName: "mydatabase", DbName: "mydatabase",
Ssl: "disable", Ssl: "disable",
} }
opt, err := b.ConvertToOptions() opt := b.ConvertToOptions()
if assert.NoError(t, err) { assert.Equal(t, expOpt, opt)
assert.Equal(t, expOpt, opt)
}
} }

459
pkg/data/bindata.go
View File

File diff suppressed because one or more lines are too long