From 9a728714aa6e6e421cd3acdb44e1c1244da03849 Mon Sep 17 00:00:00 2001
From: ZhengYang <zhengyang4k@gmail.com>
Date: Tue, 12 Aug 2014 16:04:50 +0800
Subject: [PATCH] change directory

---
 migrate.go | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/migrate.go b/migrate.go
index b0a7ffe..67abd06 100644
--- a/migrate.go
+++ b/migrate.go
@@ -48,10 +48,6 @@ bee migrate refresh
 `,
 }
 
-const (
-	TMP_DIR = "temp"
-)
-
 var mDriver docValue
 var mConn docValue
 
@@ -218,9 +214,9 @@ func runMigrationBinary(filename string) {
 	}
 }
 
-func cleanUpMigrationFiles(tmpPath string) {
-	if err := os.RemoveAll(tmpPath); err != nil {
-		ColorLog("[ERRO] Could not remove temporary migration directory: %s\n", err)
+func removeMigrationBinary(path string) {
+	if err := os.Remove(path); err != nil {
+		ColorLog("[ERRO] Could not remove migration binary: %s\n", err)
 		os.Exit(2)
 	}
 }
@@ -242,7 +238,7 @@ func migrateRefresh(driver, connStr string) {
 }
 
 func migrate(goal, driver, connStr string) {
-	filename := path.Join(TMP_DIR, "migrate")
+	filepath := path.Join("database", "migrations", "migrate")
 	// connect to database
 	db, err := sql.Open(driver, connStr)
 	if err != nil {
@@ -252,11 +248,10 @@ func migrate(goal, driver, connStr string) {
 	defer db.Close()
 	checkForSchemaUpdateTable(db)
 	latestName, latestTime := getLatestMigration(db)
-	createTempMigrationDir(TMP_DIR)
-	writeMigrationSourceFile(filename, driver, connStr, latestTime, latestName, goal)
-	buildMigrationBinary(filename)
-	runMigrationBinary(filename)
-	cleanUpMigrationFiles(TMP_DIR)
+	writeMigrationSourceFile(filepath, driver, connStr, latestTime, latestName, goal)
+	buildMigrationBinary(filepath)
+	runMigrationBinary(filepath)
+	removeMigrationBinary(filepath)
 }
 
 const (