From a8fde37028dc99d204d4a35e5a322c2698f20b86 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 8 Apr 2020 20:24:14 -0700 Subject: [PATCH] dinosql: Inline addFile --- internal/dinosql/parser.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/internal/dinosql/parser.go b/internal/dinosql/parser.go index 3ac5ee36b5..6301f06937 100644 --- a/internal/dinosql/parser.go +++ b/internal/dinosql/parser.go @@ -60,13 +60,6 @@ func (e *ParserErr) Error() string { return fmt.Sprintf("multiple errors: %d errors", len(e.Errs)) } -func addFile(files []string, newFile string) []string { - if migrations.IsDown(newFile) { - return files - } - return append(files, newFile) -} - func ReadSQLFiles(paths []string) ([]string, error) { var files []string for _, path := range paths { @@ -81,10 +74,15 @@ func ReadSQLFiles(paths []string) ([]string, error) { return nil, err } for _, f := range listing { - files = addFile(files, filepath.Join(path, f.Name())) + if migrations.IsDown(f.Name()) { + continue + } + files = append(files, filepath.Join(path, f.Name())) } } else { - files = addFile(files, path) + if !migrations.IsDown(path) { + files = append(files, path) + } } } return files, nil