From 2a86b3e31d19e8dab987dcf927cfb3363e946d53 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 27 Jun 2018 22:08:24 +0800 Subject: [PATCH] restore: reset milestone deadline_unix and closed_date_unix (#5264) --- gogs.go | 2 +- models/models.go | 16 ++++++++++++---- templates/.VERSION | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gogs.go b/gogs.go index 716094103..fc2292b18 100644 --- a/gogs.go +++ b/gogs.go @@ -16,7 +16,7 @@ import ( "github.com/gogs/gogs/pkg/setting" ) -const APP_VER = "0.11.59.0626" +const APP_VER = "0.11.59.0627" func init() { setting.AppVer = APP_VER diff --git a/models/models.go b/models/models.go index f0f63e072..6407f4134 100644 --- a/models/models.go +++ b/models/models.go @@ -360,16 +360,24 @@ func ImportDatabase(dirPath string, verbose bool) (err error) { return fmt.Errorf("insert strcut: %v", err) } + meta := make(map[string]interface{}) + if err = jsoniter.Unmarshal(scanner.Bytes(), &meta); err != nil { + log.Error(2, "Failed to unmarshal to map: %v", err) + } + // Reset created_unix back to the date save in archive because Insert method updates its value if isInsertProcessor && !skipInsertProcessors[rawTableName] { - meta := make(map[string]interface{}) - if err = jsoniter.Unmarshal(scanner.Bytes(), &meta); err != nil { - log.Error(2, "Failed to unmarshal to map: %v", err) - } if _, err = x.Exec("UPDATE "+rawTableName+" SET created_unix=? WHERE id=?", meta["CreatedUnix"], meta["ID"]); err != nil { log.Error(2, "Failed to reset 'created_unix': %v", err) } } + + switch rawTableName { + case "milestone": + if _, err = x.Exec("UPDATE "+rawTableName+" SET deadline_unix=?, closed_date_unix=? WHERE id=?", meta["DeadlineUnix"], meta["ClosedDateUnix"], meta["ID"]); err != nil { + log.Error(2, "Failed to reset 'milestone.deadline_unix', 'milestone.closed_date_unix': %v", err) + } + } } // PostgreSQL needs manually reset table sequence for auto increment keys diff --git a/templates/.VERSION b/templates/.VERSION index 483496eef..7906efe7f 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.59.0626 +0.11.59.0627