From 230f3281f5c60a18615ed575927f6f7f6557de5a Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Sep 2020 19:01:26 +0200
Subject: [PATCH 1/4] gitea dump: include version

---
 models/models.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/models/models.go b/models/models.go
index 27a0c660be1d7..32df9bdfd87b3 100644
--- a/models/models.go
+++ b/models/models.go
@@ -302,6 +302,17 @@ func DumpDatabase(filePath string, dbType string) error {
 		}
 		tbs = append(tbs, t)
 	}
+
+	type Version struct {
+		ID      int64 `xorm:"pk autoincr"`
+		Version int64
+	}
+	t, err := x.TableInfo(Version{})
+	if err != nil {
+		return err
+	}
+	tbs = append(tbs, t)
+
 	if len(dbType) > 0 {
 		return x.DumpTablesToFile(tbs, filePath, schemas.DBType(dbType))
 	}

From 87b81df58a555d1999805af902f450a03886e317 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Sep 2020 19:43:30 +0200
Subject: [PATCH 2/4] Check InstallLock (close #12759)

---
 cmd/dump.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmd/dump.go b/cmd/dump.go
index c64734122106e..4fa8ef7de517b 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -186,6 +186,10 @@ func runDump(ctx *cli.Context) error {
 	if _, err := setting.Cfg.Section("log.console").NewKey("STDERR", "true"); err != nil {
 		fatal("Setting console logger to stderr failed: %v", err)
 	}
+	if !setting.InstallLock {
+		log.Error("Is '%s' really the right config path?\n", setting.CustomConf)
+		return fmt.Errorf("gitea is not initalized")
+	}
 	setting.NewServices() // cannot access session settings otherwise
 
 	err := models.SetEngine()

From d37bbf05cfce162ac962aa7bd0873c687542e88c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Sep 2020 19:53:06 +0200
Subject: [PATCH 3/4] fix test

---
 models/models_test.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/models/models_test.go b/models/models_test.go
index 37e9a352f8af1..2441ad7fb064e 100644
--- a/models/models_test.go
+++ b/models/models_test.go
@@ -21,6 +21,12 @@ func TestDumpDatabase(t *testing.T) {
 	dir, err := ioutil.TempDir(os.TempDir(), "dump")
 	assert.NoError(t, err)
 
+	type Version struct {
+		ID      int64 `xorm:"pk autoincr"`
+		Version int64
+	}
+	assert.NoError(t, x.Sync2(Version{}))
+
 	for _, dbName := range setting.SupportedDatabases {
 		dbType := setting.GetDBTypeByName(dbName)
 		assert.NoError(t, DumpDatabase(filepath.Join(dir, dbType+".sql"), dbType))

From 9a0214a823368eba05c42e1b215d849e3abd78fb Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Sep 2020 20:01:04 +0200
Subject: [PATCH 4/4] fix lint

---
 cmd/dump.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/dump.go b/cmd/dump.go
index 4fa8ef7de517b..0e41ecb8c7efb 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -188,7 +188,7 @@ func runDump(ctx *cli.Context) error {
 	}
 	if !setting.InstallLock {
 		log.Error("Is '%s' really the right config path?\n", setting.CustomConf)
-		return fmt.Errorf("gitea is not initalized")
+		return fmt.Errorf("gitea is not initialized")
 	}
 	setting.NewServices() // cannot access session settings otherwise