Skip to content

Commit 8f88b40

Browse files
authored
Minor cleanup (#56)
1 parent f0810fb commit 8f88b40

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

main.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,13 @@ func runQuery(queryRaw string, project *runner.ProjectState, ec *runner.EvalCont
251251
}
252252

253253
func repl(project *runner.ProjectState, ec *runner.EvalContext, args *args, files []string) error {
254-
255254
tempfile, err := ioutil.TempFile("", "dsq-hist")
256255
if err != nil {
257256
return err
258257
}
259258

259+
defer os.Remove(tempfile.Name())
260+
260261
completer := readline.NewPrefixCompleter(
261262
readline.PcItem("SELECT"),
262263
readline.PcItem("FROM"),
@@ -276,8 +277,6 @@ func repl(project *runner.ProjectState, ec *runner.EvalContext, args *args, file
276277
return r, true
277278
}
278279

279-
defer os.Remove(tempfile.Name())
280-
281280
l, err := readline.NewEx(&readline.Config{
282281
Prompt: "dsq> ",
283282
HistoryFile: tempfile.Name(),
@@ -287,23 +286,19 @@ func repl(project *runner.ProjectState, ec *runner.EvalContext, args *args, file
287286
FuncFilterInputRune: filterInput,
288287
AutoComplete: completer,
289288
})
290-
291289
if err != nil {
292290
return err
293291
}
294292

295293
defer l.Close()
296294

297295
for {
298-
299296
queryRaw, err := l.Readline()
300-
301297
if err != nil {
302298
return err
303299
}
304300

305301
queryRaw = strings.TrimSpace(queryRaw)
306-
307302
if queryRaw == "" {
308303
continue
309304
}
@@ -313,8 +308,8 @@ func repl(project *runner.ProjectState, ec *runner.EvalContext, args *args, file
313308
fmt.Println("bye")
314309
return nil
315310
}
316-
err = runQuery(queryRaw, project, ec, args, files)
317311

312+
err = runQuery(queryRaw, project, ec, args, files)
318313
if err != nil {
319314
return err
320315
}

0 commit comments

Comments
 (0)