Merge pull request cockroachdb#4254 from RaduBerinde/fixquotes

sql: fix quotes in cli

cli/cli_test.go

@@ -567,12 +567,12 @@ func Example_sql() {
 	// sql -e show databases
 	// 2 rows
 	// Database
-	// "system"
-	// "t"
+	// system
+	// t
 	// sql -e explain select 3
 	// 1 row
 	// Level	Type	Description
-	// 0	"empty"	"-"
+	// 0	empty	-
 }
 
 func Example_user() {
@@ -599,7 +599,7 @@ func Example_user() {
 	// +----------+
 	// | username |
 	// +----------+
-	// | "foo"    |
+	// | foo      |
 	// +----------+
 	// user rm foo
 	// OK

cli/sql_util.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"net"
 	"net/url"
+	"unicode/utf8"
 
 	// Import postgres driver.
 	_ "github.com/lib/pq"
@@ -173,8 +174,11 @@ func formatVal(val interface{}) string {
 	case nil:
 		return "NULL"
 	case []byte:
-		// Ensure that binary protobufs print escaped.
-		return fmt.Sprintf("%q", t)
+		if !utf8.Valid(t) {
+			// Ensure that protobufs containing non-UTF8 binary data print escaped.
+			return fmt.Sprintf("%q", t)
+		}
+		return string(t)
 	}
 	return fmt.Sprint(val)
 }