balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #271 from sosedoff/pretty-json-default

Browse Source 
Fix the JSON beautifier flag
This commit is contained in:
Dan Sosedoff
2017-09-16 22:11:41 -05:00
committed by GitHub
parent 3c515fcef3 26ea9fc1b8
commit c0a4e7add1
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/client/result.go
View File

@@ -112,11 +112,12 @@ func (res *Result) CSV() []byte {
func (res *Result) JSON() []byte { func (res *Result) JSON() []byte {
var data []byte var data []byte
if command.Opts.EnablePrettyJson { if command.Opts.DisablePrettyJson {
data, _ = json.MarshalIndent(res.Format(), "", " ")
} else {
data, _ = json.Marshal(res.Format()) data, _ = json.Marshal(res.Format())
} else {
data, _ = json.MarshalIndent(res.Format(), "", " ")
} }
return data return data
} }

2
pkg/command/options.go
View File

@@ -28,7 +28,7 @@ type Options struct {
LockSession bool `long:"lock-session" description:"Lock session to a single database connection" default:"false"` LockSession bool `long:"lock-session" description:"Lock session to a single database connection" default:"false"`
Bookmark string `short:"b" long:"bookmark" description:"Bookmark to use for connection. Bookmark files are stored under $HOME/.pgweb/bookmarks/*.toml" default:""` Bookmark string `short:"b" long:"bookmark" description:"Bookmark to use for connection. Bookmark files are stored under $HOME/.pgweb/bookmarks/*.toml" default:""`
BookmarksDir string `long:"bookmarks-dir" description:"Overrides default directory for bookmark files to search" default:""` BookmarksDir string `long:"bookmarks-dir" description:"Overrides default directory for bookmark files to search" default:""`
EnablePrettyJson bool `long:"feature-pretty-json" description:"Format JSON output" default:"true"` DisablePrettyJson bool `long:"no-pretty-json" description:"Disable JSON formatting feature for result export" default:"false"`
} }
var Opts Options var Opts Options