Merge pull request #17 from nadams/schema-support

Adds schema support

Author: rubenv

migrate.go

@@ -26,6 +26,7 @@ const (
 )
 
 var tableName = "gorp_migrations"
+var schemaName = ""
 var numberPrefixRegex = regexp.MustCompile(`^(\d+).*$`)
 
 // Set the name of the table used to store migration info.
@@ -37,6 +38,22 @@ func SetTable(name string) {
 	}
 }
 
+// SetSchema sets the name of a schema that the migration table be referenced.
+func SetSchema(name string) {
+	if name != "" {
+		schemaName = name
+	}
+}
+
+func getTableName() string {
+	t := tableName
+	if schemaName != "" {
+		t = fmt.Sprintf("%s.%s", schemaName, t)
+	}
+
+	return t
+}
+
 type Migration struct {
 	Id   string
 	Up   []string
@@ -303,7 +320,7 @@ func PlanMigration(db *sql.DB, dialect string, m MigrationSource, dir MigrationD
 	}
 
 	var migrationRecords []MigrationRecord
-	_, err = dbMap.Select(&migrationRecords, fmt.Sprintf("SELECT * FROM %s", tableName))
+	_, err = dbMap.Select(&migrationRecords, fmt.Sprintf("SELECT * FROM %s", getTableName()))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -409,7 +426,7 @@ func GetMigrationRecords(db *sql.DB, dialect string) ([]*MigrationRecord, error)
 	}
 
 	var records []*MigrationRecord
-	query := fmt.Sprintf("SELECT * FROM %s ORDER BY id ASC", tableName)
+	query := fmt.Sprintf("SELECT * FROM %s ORDER BY id ASC", getTableName())
 	_, err = dbMap.Select(&records, query)
 	if err != nil {
 		return nil, err
@@ -444,7 +461,7 @@ Check https://github.com/go-sql-driver/mysql#parsetime for more info.`)
 
 	// Create migration database map
 	dbMap := &gorp.DbMap{Db: db, Dialect: d}
-	dbMap.AddTableWithName(MigrationRecord{}, tableName).SetKeys(false, "Id")
+	dbMap.AddTableWithNameAndSchema(MigrationRecord{}, schemaName, tableName).SetKeys(false, "Id")
 	//dbMap.TraceOn("", log.New(os.Stdout, "migrate: ", log.Lmicroseconds))
 
 	err := dbMap.CreateTablesIfNotExists()

sql-migrate/config.go

@@ -35,6 +35,7 @@ type Environment struct {
 	DataSource string `yaml:"datasource"`
 	Dir        string `yaml:"dir"`
 	TableName  string `yaml:"table"`
+	SchemaName string `yaml:"schema"`
 }
 
 func ReadConfig() (map[string]*Environment, error) {
@@ -79,6 +80,10 @@ func GetEnvironment() (*Environment, error) {
 		migrate.SetTable(env.TableName)
 	}
 
+	if env.SchemaName != "" {
+		migrate.SetSchema(env.SchemaName)
+	}
+
 	return env, nil
 }