Merge pull request #34 from stxml/master

Expand environment variables in datasource

Author: rubenv

sql-migrate/config.go

@@ -6,6 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 
 	"github.com/rubenv/sql-migrate"
 	"gopkg.in/gorp.v1"
@@ -71,6 +72,7 @@ func GetEnvironment() (*Environment, error) {
 	if env.DataSource == "" {
 		return nil, errors.New("No data source specified")
 	}
+	env.DataSource = os.ExpandEnv(env.DataSource)
 
 	if env.Dir == "" {
 		env.Dir = "migrations"

test-integration/dbconfig.yml

@@ -13,6 +13,11 @@ mysql_noflag:
     datasource: root@/test
     dir: test-migrations
 
+mysql_env:
+    dialect: mysql
+    datasource: ${MYSQL_USER}@/$DATABASE?parseTime=true
+    dir: test-migrations
+
 sqlite:
     dialect: sqlite3
     datasource: test.db

test-integration/mysql-env.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Tweak PATH for Travis
+export PATH=$PATH:$HOME/gopath/bin
+
+export MYSQL_USER=root
+export DATABASE=test
+
+OPTIONS="-config=test-integration/dbconfig.yml -env mysql_env"
+
+set -ex
+
+sql-migrate status $OPTIONS
+sql-migrate up $OPTIONS
+sql-migrate down $OPTIONS
+sql-migrate redo $OPTIONS
+sql-migrate status $OPTIONS