@@ -76,7 +76,7 @@ func mustNewSQLRunner(quitContext context.Context, printer func(string), query s
76
76
func (sr * sqlRunner ) runSQL (db database , key string ) bool {
77
77
typ , ok := validSQLTypes [db .SQLType ]
78
78
if ! ok {
79
- usage ( "Unknown sql type %v for %v" , db .SQLType , db )
79
+ return maybeErrorResult ( key , fmt . Sprintf ( "Unknown sql type %v for %v" , db .SQLType , key ) )
80
80
}
81
81
82
82
sqlOptions := sqlTypeToOptions [typ ]
@@ -137,19 +137,16 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
137
137
138
138
stdout , err := cmd .StdoutPipe ()
139
139
if err != nil {
140
- log .Printf ("Cannot create pipe for STDOUT of running command on %v; not running. err=%v\n " , key , err )
141
- return false
140
+ return maybeErrorResult (key , fmt .Sprintf ("Cannot create pipe for STDOUT of running command on %v; not running. err=%v\n " , key , err ))
142
141
}
143
142
144
143
stderr , err := cmd .StderrPipe ()
145
144
if err != nil {
146
- log .Printf ("Cannot create pipe for STDERR of running command on %v; not running. err=%v\n " , key , err )
147
- return false
145
+ return maybeErrorResult (key , fmt .Sprintf ("Cannot create pipe for STDERR of running command on %v; not running. err=%v\n " , key , err ))
148
146
}
149
147
150
148
if err := cmd .Start (); err != nil {
151
- log .Printf ("Cannot start command on %v; not running. err=%v\n " , key , err )
152
- return false
149
+ return maybeErrorResult (key , fmt .Sprintf ("Cannot start command on %v; not running. err=%v\n " , key , err ))
153
150
}
154
151
155
152
scanner := bufio .NewScanner (stdout )
@@ -168,6 +165,10 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
168
165
169
166
cmd .Wait ()
170
167
168
+ return maybeErrorResult (key , stderrLines ... )
169
+ }
170
+
171
+ func maybeErrorResult (key string , stderrLines ... string ) bool {
171
172
result := true
172
173
if len (stderrLines ) > 0 {
173
174
result = false
@@ -176,6 +177,5 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
176
177
log .Println (key + " [ERROR] " + v )
177
178
}
178
179
}
179
-
180
180
return result
181
181
}
0 commit comments