Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-20 15:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

restore: reset table sequences for PostgreSQL (#4357)

Browse Source
This commit is contained in:
Unknwon
2017-05-21 04:37:37 -04:00
parent ce6e8ed8fe
commit b17995a332
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/restore.go
View File

@@ -83,7 +83,7 @@ func runRestore(c *cli.Context) error {
// Database // Database
dbDir := path.Join(archivePath, "db") dbDir := path.Join(archivePath, "db")
if err = models.ImportDatabase(dbDir); err != nil { if err = models.ImportDatabase(dbDir, c.Bool("verbose")); err != nil {
log.Fatal(0, "Fail to import database: %v", err) log.Fatal(0, "Fail to import database: %v", err)
} }

2
gogs.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
) )
const APP_VER = "0.11.10.0517" const APP_VER = "0.11.11.0521"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

17
models/models.go
View File

@@ -302,7 +302,9 @@ func DumpDatabase(dirPath string) (err error) {
} }
// ImportDatabase imports data from backup archive. // ImportDatabase imports data from backup archive.
func ImportDatabase(dirPath string) (err error) { func ImportDatabase(dirPath string, verbose bool) (err error) {
snakeMapper := core.SnakeMapper{}
// Purposely create a local variable to not modify global variable // Purposely create a local variable to not modify global variable
tables := append(tables, new(Version)) tables := append(tables, new(Version))
for _, table := range tables { for _, table := range tables {
@@ -312,6 +314,10 @@ func ImportDatabase(dirPath string) (err error) {
continue continue
} }
if verbose {
log.Trace("Importing table '%s'...", tableName)
}
if err = x.DropTables(table); err != nil { if err = x.DropTables(table); err != nil {
return fmt.Errorf("fail to drop table '%s': %v", tableName, err) return fmt.Errorf("fail to drop table '%s': %v", tableName, err)
} else if err = x.Sync2(table); err != nil { } else if err = x.Sync2(table); err != nil {
@@ -353,6 +359,15 @@ func ImportDatabase(dirPath string) (err error) {
return fmt.Errorf("fail to insert strcut: %v", err) return fmt.Errorf("fail to insert strcut: %v", err)
} }
} }
// PostgreSQL needs manually reset table sequence for auto increment keys
if setting.UsePostgreSQL {
rawTableName := snakeMapper.Obj2Table(tableName)
seqName := rawTableName + "_id_seq"
if _, err = x.Exec(fmt.Sprintf(`SELECT setval('%s', COALESCE((SELECT MAX(id)+1 FROM "%s"), 1), false);`, seqName, rawTableName)); err != nil {
return fmt.Errorf("fail to reset table '%s' sequence: %v", rawTableName, err)
}
}
} }
return nil return nil
} }

2
templates/.VERSION
View File

@@ -1 +1 @@
0.11.10.0517 0.11.11.0521