mysql: output vertical format when query ends in \G

Author: therealplato

main_test.go

@@ -81,6 +81,19 @@ var baseTests = tests{
 	},
 }
 
+var mysqlTests = tests{{
+	name:      `mysql outputs vertical with \G`,
+	targetDBs: []string{"db1"},
+	query:     `SELECT id, name FROM table1 order by id asc limit 1\G`,
+	expected: []string{
+		"",
+		"*************************** 1. row ***************************",
+		"id: 1",
+		"name: John",
+	},
+},
+}
+
 func Test_MySQL(t *testing.T) {
 	awaitDB(mySQL, t)
 
@@ -92,6 +105,7 @@ func Test_MySQL(t *testing.T) {
 		}
 	)
 	runTests(baseTests, testConfig, t)
+	runTests(mysqlTests, testConfig, t)
 }
 
 func Test_PostgreSQL(t *testing.T) {

sql_runner.go

@@ -14,11 +14,12 @@ type sqlType int
 
 const (
 	mySQL sqlType = iota + 1
+	mySQLVertical
 	postgreSQL
 )
 
 func (t sqlType) String() string {
-	return [...]string{"", "MySQL", "PostgreSQL"}[t]
+	return [...]string{"", "MySQL", "MySQL", "PostgreSQL"}[t]
 }
 
 type exists struct{}
@@ -47,6 +48,14 @@ var sqlTypeToOptions = map[sqlType]sqlOptions{
 		"%v",
 		"-Nsre",
 	},
+	mySQLVertical: {
+		"mysql",
+		"-u%v",
+		"-h%v",
+		"-p%v",
+		"%v",
+		"-Ee",
+	},
 	postgreSQL: {
 		"psql",
 		"-U %v",
@@ -62,14 +71,21 @@ type sqlRunner struct {
 	query       string
 	quitContext context.Context
 	multi       bool
+	vertical    bool
 }
 
 func mustNewSQLRunner(quitContext context.Context, printer func(string), query string, multi bool) *sqlRunner {
+	var vertical bool
+	if strings.HasSuffix(query, `\G`) {
+		vertical = true
+		query = strings.TrimSuffix(query, `\G`)
+	}
 	return &sqlRunner{
 		printer,
 		query,
 		quitContext,
 		multi,
+		vertical,
 	}
 }
 
@@ -78,6 +94,9 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
 	if !ok {
 		return maybeErrorResult(key, fmt.Sprintf("Unknown sql type %v for %v", db.SQLType, key))
 	}
+	if sr.vertical && typ == mySQL {
+		typ = mySQLVertical
+	}
 
 	sqlOptions := sqlTypeToOptions[typ]