upgrader.go

@@ -43,7 +43,7 @@ func (upgrader *Upgrader) Version(dbName string) (version int, err error) {// {{
 		return
 	}
 
-	version, err = dbase.Version()
+	version, err = dbase.version()
 	return
 }// }}}
 
@@ -111,7 +111,7 @@ func (dbase Database) verifySchemaEntry() (err error) {// {{{
 
 	return
 }// }}}
-func (dbase Database) Version() (version int, err error) {// {{{
+func (dbase Database) version() (version int, err error) {// {{{
 	var rows *sql.Rows
 	rows, err = dbase.db.Query(
 		`SELECT version FROM `+dbase.upgrader.schema+`.schema ORDER BY version DESC LIMIT 1`,
@@ -130,7 +130,8 @@ func (dbase Database) Version() (version int, err error) {// {{{
 }// }}}
 
 // AddDatabase sets a database up for the Run() function with verifying/creating the _db.schema table.
-func (upgrader Upgrader) AddDatabase(host string, port int, dbName, user, pass string) (db Database, err error) {// {{{
+func (upgrader Upgrader) AddDatabase(host string, port int, dbName, user, pass string) (err error) {// {{{
+	var db Database
 	if db, err = newDatabase(host, port, dbName, user, pass); err != nil {
 		return
 	}
@@ -150,11 +151,11 @@ func (upgrader Upgrader) Run() (err error) {// {{{
 	var version int
 
 	for dbName, dbase := range upgrader.databases {
-		version, err = dbase.Version()
+		version, err = dbase.version()
 		if err != nil {
 			return
 		}
-		upgrader.logCallback("version", fmt.Sprintf("%s.%s: %d", dbName, upgrader.schema, version))
+		upgrader.logCallback("version", fmt.Sprintf("%s: %d", dbName, version))
 
 		for {
 			version++
@@ -163,7 +164,7 @@ func (upgrader Upgrader) Run() (err error) {// {{{
 				break
 			}
 
-			upgrader.logCallback("exec", fmt.Sprintf("%s.%s: %d", dbName, upgrader.schema, version))
+			upgrader.logCallback("exec", fmt.Sprintf("%s: %d", dbName, version))
 			if _, err = dbase.db.Exec(string(sql)); err != nil {
 				return
 			}