From 2a9c8a91b9db5be18b493ceaf48d00bdc7b267a6 Mon Sep 17 00:00:00 2001 From: Nicholas Duffy Date: Sun, 7 May 2017 07:17:09 -0600 Subject: [PATCH] Fix globbing for files in subdirectories The glob `/**/*.sql` was looking for files in subdirectories only and not finding SQL files in the root directory. Now making two globs and combining the slices. --- migrate.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migrate.go b/migrate.go index bd3e48a..2778faf 100644 --- a/migrate.go +++ b/migrate.go @@ -97,7 +97,10 @@ func CollectMigrations(dirpath string, current, target int64) (Migrations, error // extract the numeric component of each migration, // filter out any uninteresting files, // and ensure we only have one file per migration version. - sqlMigrations, err := filepath.Glob(dirpath + "/**/*.sql") + sqlMigrations, err := filepath.Glob(dirpath + "/*.sql") + sqlMigrationsSubDirectories, err := filepath.Glob(dirpath + "/**/*.sql") + sqlMigrations = append(sqlMigrations, sqlMigrationsSubDirectories...) + if err != nil { return nil, err }