Merge pull request #9007 from mjibson/zone

cli: don't output SQL results during zone set
cockroachdb · Sep 1, 2016 · 18929ed · 18929ed
2 parents b91954a + 523c510
commit 18929ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -502,7 +502,6 @@ func Example_zone() {
 	// zone ls
 	// .default
 	// zone set system --file=./testdata/zone_attrs.yaml
-	// INSERT 1
 	// range_min_bytes: 1048576
 	// range_max_bytes: 67108864
 	// gc:
@@ -523,7 +522,6 @@ func Example_zone() {
 	// num_replicas: 1
 	// constraints: [us-east-1a, ssd]
 	// zone set system --file=./testdata/zone_range_max_bytes.yaml
-	// UPDATE 1
 	// range_min_bytes: 1048576
 	// range_max_bytes: 134217728
 	// gc:
@@ -545,7 +543,6 @@ func Example_zone() {
 	// zone rm .default
 	// unable to remove .default
 	// zone set .default --file=./testdata/zone_range_max_bytes.yaml
-	// UPDATE 1
 	// range_min_bytes: 1048576
 	// range_max_bytes: 134217728
 	// gc:

diff --git a/cli/zone.go b/cli/zone.go
@@ -454,7 +454,7 @@ func runSetZone(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	zoneID, zone, err := queryZonePath(conn, path)
+	_, zone, err := queryZonePath(conn, path)
 	if err != nil {
 		return err
 	}
@@ -486,13 +486,9 @@ func runSetZone(cmd *cobra.Command, args []string) error {
 	}
 
 	id := path[len(path)-1]
-	if id == zoneID {
-		err = runQueryAndFormatResults(conn, os.Stdout,
-			makeQuery(`UPDATE system.zones SET config = $2 WHERE id = $1`, id, buf), cliCtx.prettyFmt)
-	} else {
-		err = runQueryAndFormatResults(conn, os.Stdout,
-			makeQuery(`INSERT INTO system.zones VALUES ($1, $2)`, id, buf), cliCtx.prettyFmt)
-	}
+	_, _, _, err = runQuery(conn, makeQuery(
+		`UPSERT INTO system.zones (id, config) VALUES ($1, $2)`,
+		id, buf), false)
 	if err != nil {
 		return err
 	}