From 26ea9fc1b8a64ba5a9c1f43d3f5b1e3c8029ea23 Mon Sep 17 00:00:00 2001
From: Dan Sosedoff <dan.sosedoff@gmail.com>
Date: Sat, 16 Sep 2017 21:57:04 -0500
Subject: [PATCH] Fix the JSON beautifier flag

---
 pkg/client/result.go   |  7 ++++---
 pkg/command/options.go | 42 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/pkg/client/result.go b/pkg/client/result.go
index 99476ef..066187b 100644
--- a/pkg/client/result.go
+++ b/pkg/client/result.go
@@ -112,11 +112,12 @@ func (res *Result) CSV() []byte {
 func (res *Result) JSON() []byte {
 	var data []byte
 
-	if command.Opts.EnablePrettyJson {
-		data, _ = json.MarshalIndent(res.Format(), "", " ")
-	} else {
+	if command.Opts.DisablePrettyJson {
 		data, _ = json.Marshal(res.Format())
+	} else {
+		data, _ = json.MarshalIndent(res.Format(), "", " ")
 	}
+
 	return data
 }
 
diff --git a/pkg/command/options.go b/pkg/command/options.go
index 20011e0..6c82f72 100644
--- a/pkg/command/options.go
+++ b/pkg/command/options.go
@@ -8,27 +8,27 @@ import (
 )
 
 type Options struct {
-	Version          bool   `short:"v" long:"version" description:"Print version"`
-	Debug            bool   `short:"d" long:"debug" description:"Enable debugging mode" default:"false"`
-	Url              string `long:"url" description:"Database connection string"`
-	Host             string `long:"host" description:"Server hostname or IP"`
-	Port             int    `long:"port" description:"Server port" default:"5432"`
-	User             string `long:"user" description:"Database user"`
-	Pass             string `long:"pass" description:"Password for user"`
-	DbName           string `long:"db" description:"Database name"`
-	Ssl              string `long:"ssl" description:"SSL option"`
-	HttpHost         string `long:"bind" description:"HTTP server host" default:"localhost"`
-	HttpPort         uint   `long:"listen" description:"HTTP server listen port" default:"8081"`
-	AuthUser         string `long:"auth-user" description:"HTTP basic auth user"`
-	AuthPass         string `long:"auth-pass" description:"HTTP basic auth password"`
-	SkipOpen         bool   `short:"s" long:"skip-open" description:"Skip browser open on start"`
-	Sessions         bool   `long:"sessions" description:"Enable multiple database sessions" default:"false"`
-	Prefix           string `long:"prefix" description:"Add a url prefix"`
-	ReadOnly         bool   `long:"readonly" description:"Run database connection in readonly mode"`
-	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:""`
-	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"`
+	Version           bool   `short:"v" long:"version" description:"Print version"`
+	Debug             bool   `short:"d" long:"debug" description:"Enable debugging mode" default:"false"`
+	Url               string `long:"url" description:"Database connection string"`
+	Host              string `long:"host" description:"Server hostname or IP"`
+	Port              int    `long:"port" description:"Server port" default:"5432"`
+	User              string `long:"user" description:"Database user"`
+	Pass              string `long:"pass" description:"Password for user"`
+	DbName            string `long:"db" description:"Database name"`
+	Ssl               string `long:"ssl" description:"SSL option"`
+	HttpHost          string `long:"bind" description:"HTTP server host" default:"localhost"`
+	HttpPort          uint   `long:"listen" description:"HTTP server listen port" default:"8081"`
+	AuthUser          string `long:"auth-user" description:"HTTP basic auth user"`
+	AuthPass          string `long:"auth-pass" description:"HTTP basic auth password"`
+	SkipOpen          bool   `short:"s" long:"skip-open" description:"Skip browser open on start"`
+	Sessions          bool   `long:"sessions" description:"Enable multiple database sessions" default:"false"`
+	Prefix            string `long:"prefix" description:"Add a url prefix"`
+	ReadOnly          bool   `long:"readonly" description:"Run database connection in readonly mode"`
+	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:""`
+	BookmarksDir      string `long:"bookmarks-dir" description:"Overrides default directory for bookmark files to search" default:""`
+	DisablePrettyJson bool   `long:"no-pretty-json" description:"Disable JSON formatting feature for result export" default:"false"`
 }
 
 var Opts Options