Skip to content

Commit 5bd877a

Browse files
committed
Refactor errors in sql_runner
1 parent 6e33592 commit 5bd877a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

sql_runner.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func mustNewSQLRunner(quitContext context.Context, printer func(string), query s
7676
func (sr *sqlRunner) runSQL(db database, key string) bool {
7777
typ, ok := validSQLTypes[db.SQLType]
7878
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))
8080
}
8181

8282
sqlOptions := sqlTypeToOptions[typ]
@@ -137,19 +137,16 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
137137

138138
stdout, err := cmd.StdoutPipe()
139139
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))
142141
}
143142

144143
stderr, err := cmd.StderrPipe()
145144
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))
148146
}
149147

150148
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))
153150
}
154151

155152
scanner := bufio.NewScanner(stdout)
@@ -168,6 +165,10 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
168165

169166
cmd.Wait()
170167

168+
return maybeErrorResult(key, stderrLines...)
169+
}
170+
171+
func maybeErrorResult(key string, stderrLines ...string) bool {
171172
result := true
172173
if len(stderrLines) > 0 {
173174
result = false
@@ -176,6 +177,5 @@ func (sr *sqlRunner) runSQL(db database, key string) bool {
176177
log.Println(key + " [ERROR] " + v)
177178
}
178179
}
179-
180180
return result
181181
}

0 commit comments

Comments
 (0)