From 78a2b24d133b74e4ca25d2668c669a39c56d23df Mon Sep 17 00:00:00 2001
From: Liam Staskawicz <lstask@gmail.com>
Date: Sun, 23 Dec 2012 14:03:26 -0800
Subject: [PATCH] up: make use of filepath.Walk to simplify traversing
 migration files

---
 migrate.go | 13 ++++++++++---
 up.go      | 30 ++++++++----------------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/migrate.go b/migrate.go
index c4b3292..ca53a86 100644
--- a/migrate.go
+++ b/migrate.go
@@ -190,12 +190,19 @@ func (m *MigrationMap) Sort(direction bool) {
 //  XXX_descriptivename.ext
 // where XXX specifies the version number
 // and ext specifies the type of migration
-func numericComponent(path string) (int, error) {
-	idx := strings.Index(path, "_")
+func numericComponent(name string) (int, error) {
+
+	base := path.Base(name)
+
+	if ext := path.Ext(base); ext != ".go" && ext != ".sql" {
+		return 0, errors.New("not a recognized migration file type")
+	}
+
+	idx := strings.Index(base, "_")
 	if idx < 0 {
 		return 0, errors.New("no separator found")
 	}
-	return strconv.Atoi(path[:idx])
+	return strconv.Atoi(base[:idx])
 }
 
 // retrieve the current version for this DB.
diff --git a/up.go b/up.go
index 90c4462..58fc2be 100644
--- a/up.go
+++ b/up.go
@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"path/filepath"
 )
 
 var upCmd = &Command{
@@ -32,33 +33,18 @@ func upRun(cmd *Command, args ...string) {
 // within a folder of migration scripts
 func mostRecentVersionAvailable(dirpath string) int {
 
-	dir, err := os.Open(dirpath)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	names, err := dir.Readdirnames(0)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	mostRecent := -1
 
-	for _, name := range names {
+	filepath.Walk(dirpath, func(name string, info os.FileInfo, err error) error {
 
-		if ext := path.Ext(name); ext != ".go" && ext != ".sql" {
-			continue
+		if v, e := numericComponent(name); e == nil {
+			if v > mostRecent {
+				mostRecent = v
+			}
 		}
 
-		v, e := numericComponent(name)
-		if e != nil {
-			continue
-		}
-
-		if v > mostRecent {
-			mostRecent = v
-		}
-	}
+		return nil
+	})
 
 	return mostRecent
 }