Skip to content

dinosql: Inline addFile #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2020
Merged

dinosql: Inline addFile #446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions internal/dinosql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down