hoangvv/NextZen-UserService
1
0
Fork 0
mirror of https://github.com/KaySar12/NextZen-UserService.git synced 2025-10-06 19:59:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix migration from v0.3.3 (#11)

Browse Source
This commit is contained in:
Tiger Wang (王豫)
2022-08-31 17:56:39 -04:00
committed by GitHub
parent 9afe211d90
commit 6c73a4be13
4 changed files with 115 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/migration-tool/migration_032_and_older.go
+44 -3
View File
@@ -1,6 +1,7 @@
package main
import (
"database/sql"
"os"
"path/filepath"
"strconv"
@@ -94,16 +95,56 @@ func (u *migrationTool1) Migrate() error {
}
func (u *migrationTool1) PostMigrate() error {
_logger.Info("Deleting legacy `user` section in %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
_logger.Info("Deleting legacy `user` section in %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile.DeleteSection("user")
return legacyConfigFile.SaveTo(version.LegacyCasaOSConfigFilePath)
if err := legacyConfigFile.SaveTo(version.LegacyCasaOSConfigFilePath); err != nil {
return err
}
dbPath := legacyConfigFile.Section("app").Key("DBPath").String()
dbFile := filepath.Join(dbPath, "db", "casaOS.db")
if _, err := os.Stat(dbFile); err != nil {
dbFile = filepath.Join(defaultDBPath, "db", "casaOS.db")
if _, err := os.Stat(dbFile); err != nil {
return nil
}
}
legacyDB, err := sql.Open("sqlite3", dbFile)
if err != nil {
return err
}
defer legacyDB.Close()
for _, tableName := range []string{"o_users", "o_user"} {
tableExists, err := isTableExist(legacyDB, tableName)
if err != nil {
return err
}
if !tableExists {
continue
}
_logger.Info("Dropping `%s` table in legacy database...", tableName)
if _, err = legacyDB.Exec("DROP TABLE " + tableName); err != nil {
_logger.Error("Failed to drop `%s` table in legacy database: %s", tableName, err)
}
}
return nil
}
func NewMigrationToolFor032AndOlder() interfaces.MigrationTool {
cmd/migration-tool/migration_033_034_035.go
+62 -44
View File
@@ -125,6 +125,14 @@ func (u *migrationTool2) PostMigrate() error {
return err
}
_logger.Info("Deleting legacy `user` section in %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile.DeleteSection("user")
if err := legacyConfigFile.SaveTo(version.LegacyCasaOSConfigFilePath); err != nil {
return err
}
dbPath := legacyConfigFile.Section("app").Key("DBPath").String()
dbFile := filepath.Join(dbPath, "db", "casaOS.db")
@@ -133,7 +141,7 @@ func (u *migrationTool2) PostMigrate() error {
dbFile = filepath.Join(defaultDBPath, "db", "casaOS.db")
if _, err := os.Stat(dbFile); err != nil {
return err
return nil
}
}
@@ -144,21 +152,24 @@ func (u *migrationTool2) PostMigrate() error {
defer legacyDB.Close()
if tableExists, err := isTableExist(legacyDB, "o_users"); err != nil {
return err
} else if tableExists {
_logger.Info("Dropping `o_users` table in legacy database...")
for _, tableName := range []string{"o_users", "o_user"} {
tableExists, err := isTableExist(legacyDB, tableName)
if err != nil {
return err
}
if _, err = legacyDB.Exec("DROP TABLE o_users"); err != nil {
_logger.Error("Failed to drop `o_users` table in legacy database: %s", err)
if !tableExists {
continue
}
_logger.Info("Dropping `%s` table in legacy database...", tableName)
if _, err = legacyDB.Exec("DROP TABLE " + tableName); err != nil {
_logger.Error("Failed to drop `%s` table in legacy database: %s", tableName, err)
}
}
_logger.Info("Deleting legacy `user` section in %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile.DeleteSection("user")
return legacyConfigFile.SaveTo(version.LegacyCasaOSConfigFilePath)
return nil
}
func NewMigrationToolFor033_034_035() interfaces.MigrationTool {
@@ -220,47 +231,54 @@ func migrateUser2(legacyConfigFile *ini.File) error {
defer legacyDB.Close()
if tableExists, err := isTableExist(legacyDB, "o_users"); err != nil {
return err
} else if !tableExists {
_logger.Info("Table `o_users` not found in legacy database. Skipping...")
return nil
}
sqlStatement := "SELECT id, username, password, role, email, nickname, avatar, description, created_at FROM o_users ORDER BY id ASC"
rows, err := legacyDB.Query(sqlStatement)
if err != nil {
return err
}
defer rows.Close()
newDB := sqlite.GetDb(config.AppInfo.DBPath)
userService := service.NewUserService(newDB)
for rows.Next() {
if err := rows.Scan(
&user.Id,
&user.Username,
&user.Password,
&user.Role,
&user.Email,
&user.Nickname,
&user.Avatar,
&user.Description,
&user.CreatedAt,
); err != nil {
// create an inline map from string to string
sqlTableStatementMap := make(map[string]string)
sqlTableStatementMap["o_users"] = "SELECT id, username, password, role, email, nickname, avatar, description, created_at FROM o_users ORDER BY id ASC"
sqlTableStatementMap["o_user"] = "SELECT id, user_name, password, role, email, nick_name, avatar, description, created_at FROM o_user ORDER BY id ASC"
// historically there were two names for user table: o_users and users
for tableName, sqlStatement := range sqlTableStatementMap {
tableExists, err := isTableExist(legacyDB, tableName)
if err != nil {
return err
}
if userService.GetUserAllInfoByName(user.Username).Id > 0 {
_logger.Info("User %s already exists in user database at %s, skipping...", user.Username, config.AppInfo.DBPath)
if !tableExists {
continue
}
rows, err := legacyDB.Query(sqlStatement)
if err != nil {
return err
}
_logger.Info("Creating user %s in user database...", user.Username)
user = userService.CreateUser(user)
defer rows.Close()
for rows.Next() {
if err := rows.Scan(
&user.Id,
&user.Username,
&user.Password,
&user.Role,
&user.Email,
&user.Nickname,
&user.Avatar,
&user.Description,
&user.CreatedAt,
); err != nil {
return err
}
if userService.GetUserAllInfoByName(user.Username).Id > 0 {
_logger.Info("User %s already exists in user database at %s, skipping...", user.Username, config.AppInfo.DBPath)
continue
}
_logger.Info("Creating user %s in user database...", user.Username)
user = userService.CreateUser(user)
}
}
return nil