database upgrade works

YuanFanBin · Jun 7, 2019 · dbb54ff · dbb54ff
1 parent d96092a
commit dbb54ff
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/server/db/mysql/adapter.go b/server/db/mysql/adapter.go
@@ -124,6 +124,14 @@ func (a *adapter) GetDbVersion() (int, error) {
 	return vers, nil
 }
 
+func (a *adapter) updateDbVersion(v int) error {
+	a.version = -1
+	if _, err := a.db.Exec("UPDATE kvmeta SET `value`=? WHERE `key`='version'", v); err != nil {
+		return err
+	}
+	return nil
+}
+
 // CheckDbVersion checks whether the actual DB version matches the expected version of this adapter.
 func (a *adapter) CheckDbVersion() error {
 	version, err := a.GetDbVersion()
@@ -433,13 +441,6 @@ func (a *adapter) CreateDb(reset bool) error {
 	return tx.Commit()
 }
 
-func (a *adapter) updateDbVersion(v int) error {
-	if _, err := a.db.Exec("UPDATE kvmeta SET version=? WHERE key='version'", v); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (a *adapter) UpgradeDb() error {
 	if _, err := a.GetDbVersion(); err != nil {
 		return err

diff --git a/server/db/rethinkdb/adapter.go b/server/db/rethinkdb/adapter.go
@@ -159,6 +159,15 @@ func (a *adapter) GetDbVersion() (int, error) {
 	return vers, nil
 }
 
+func (a *adapter) updateDbVersion(v int) error {
+	a.version = -1
+	if _, err := rdb.DB(a.dbName).Table("kvmeta").Get("version").
+		Update(map[string]interface{}{"value": v}).RunWrite(a.conn); err != nil {
+		return err
+	}
+	return nil
+}
+
 // CheckDbVersion checks whether the actual DB version matches the expected version of this adapter.
 func (a *adapter) CheckDbVersion() error {
 	version, err := a.GetDbVersion()
@@ -341,14 +350,6 @@ func (a *adapter) CreateDb(reset bool) error {
 	return nil
 }
 
-func (a *adapter) updateDbVersion(v int) error {
-	if _, err := rdb.DB(a.dbName).Table("kvmeta").Get("version").
-		Update(map[string]interface{}{"value": v}).RunWrite(a.conn); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (a *adapter) UpgradeDb() error {
 	_, err := a.GetDbVersion()
 	if err != nil {

diff --git a/tinode-db/gendb.go b/tinode-db/gendb.go
@@ -61,7 +61,7 @@ func genDb(data *Data) {
 
 		// Save credentials: email and phone number as if they were confirmed.
 		if uu.Email != "" {
-			if err := store.Users.SaveCred(&types.Credential{
+			if err := store.Users.UpsertCred(&types.Credential{
 				User:   user.Id,
 				Method: "email",
 				Value:  uu.Email,
@@ -71,7 +71,7 @@ func genDb(data *Data) {
 			}
 		}
 		if uu.Tel != "" {
-			if err := store.Users.SaveCred(&types.Credential{
+			if err := store.Users.UpsertCred(&types.Credential{
 				User:   user.Id,
 				Method: "tel",
 				Value:  uu.Tel,

diff --git a/tinode-db/main.go b/tinode-db/main.go
@@ -8,6 +8,8 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
+	"strconv"
+	"strings"
 	"time"
 
 	jcr "github.com/DisposaBoy/JsonConfigReader"
@@ -170,7 +172,7 @@ func main() {
 	flag.Parse()
 
 	var data Data
-	if *datafile != "" && *data != "-" {
+	if *datafile != "" && *datafile != "-" {
 		raw, err := ioutil.ReadFile(*datafile)
 		if err != nil {
 			log.Fatal("Failed to parse data:", err)
@@ -219,10 +221,13 @@ func main() {
 
 	if *upgrade {
 		// Upgrade DB from one version to another.
-		err = store.UpgradeDb(config)
+		err = store.UpgradeDb(string(config.StoreConfig))
+		if err == nil {
+			log.Println("Database successfully upgraded")
+		}
 	} else {
 		// Reset or create DB
-		err = store.InitDb(config, true)
+		err = store.InitDb(string(config.StoreConfig), true)
 	}
 
 	if err != nil {