exclude golang-migrate .down.sql files in dirs + single files (#445)

Author: ereyes01

internal/dinosql/parser.go

@@ -60,6 +60,13 @@ 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 {
@@ -74,13 +81,10 @@ func ReadSQLFiles(paths []string) ([]string, error) {
 				return nil, err
 			}
 			for _, f := range listing {
-				files = append(files, filepath.Join(path, f.Name()))
+				files = addFile(files, filepath.Join(path, f.Name()))
 			}
 		} else {
-			files = append(files, path)
-		}
-		if migrations.IsDown(path) {
-			continue
+			files = addFile(files, path)
 		}
 	}
 	return files, nil

internal/dinosql/parser_test.go

@@ -1,6 +1,9 @@
 package dinosql
 
 import (
+	"io/ioutil"
+	"os"
+	"path"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -184,3 +187,59 @@ func TestExpand(t *testing.T) {
 		t.Errorf("mismatch:\nexpected: %s\n  acutal: %s", expected, actual)
 	}
 }
+
+func TestReadFiles(t *testing.T) {
+	dir, err := ioutil.TempDir("", "sqlc-test-read-files")
+	if err != nil {
+		t.Error(err)
+	}
+	defer os.RemoveAll(dir)
+
+	subdir1 := path.Join(dir, "subdir1")
+	if err := os.Mkdir(subdir1, 0777); err != nil {
+		t.Error(err)
+	}
+
+	subdir2 := path.Join(dir, "subdir2")
+	if err := os.Mkdir(subdir2, 0777); err != nil {
+		t.Error(err)
+	}
+
+	files := []string{
+		path.Join(subdir1, "include-me.sql"),
+		path.Join(subdir1, "include-me.up.sql"),
+		path.Join(subdir1, "not-me.down.sql"),
+		path.Join(subdir2, "include-me.sql"),
+		path.Join(subdir2, "include-me.up.sql"),
+		path.Join(subdir2, "not-me.down.sql"),
+	}
+	for _, filename := range files {
+		fd, err := os.Create(filename)
+		if err != nil {
+			t.Error(err)
+		}
+		defer fd.Close()
+	}
+
+	input := []string{
+		subdir1,
+		path.Join(subdir2, "include-me.sql"),
+		path.Join(subdir2, "include-me.up.sql"),
+		path.Join(subdir2, "not-me.down.sql"),
+	}
+
+	expectedFiles := []string{
+		path.Join(subdir1, "include-me.sql"),
+		path.Join(subdir1, "include-me.up.sql"),
+		path.Join(subdir2, "include-me.sql"),
+		path.Join(subdir2, "include-me.up.sql"),
+	}
+
+	filesRead, err := ReadSQLFiles(input)
+	if err != nil {
+		t.Error(err)
+	}
+	if !cmp.Equal(expectedFiles, filesRead) {
+		t.Errorf("unexpected files: %s", cmp.Diff(expectedFiles, filesRead))
+	}
+}