Skip to content

Commit 980dd0b

Browse files
authored
Update xorm and dependencies vendor for feature to dump to other database (#565)
* update xorm and dependencies vendor for feature to dump to other database * fix golint
1 parent 70900bd commit 980dd0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4156
-3640
lines changed

cmd/dump.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
4141
Value: os.TempDir(),
4242
Usage: "Temporary dir path",
4343
},
44+
cli.StringFlag{
45+
Name: "database, d",
46+
Usage: "Specify the database SQL syntax",
47+
},
4448
},
4549
}
4650

@@ -71,8 +75,14 @@ func runDump(ctx *cli.Context) error {
7175
log.Fatalf("Fail to dump local repositories: %v", err)
7276
}
7377

74-
log.Printf("Dumping database...")
75-
if err := models.DumpDatabase(dbDump); err != nil {
78+
targetDBType := ctx.String("database")
79+
if len(targetDBType) > 0 && targetDBType != models.DbCfg.Type {
80+
log.Printf("Dumping database %s => %s...", models.DbCfg.Type, targetDBType)
81+
} else {
82+
log.Printf("Dumping database...")
83+
}
84+
85+
if err := models.DumpDatabase(dbDump, targetDBType); err != nil {
7686
log.Fatalf("Fail to dump database: %v", err)
7787
}
7888

models/models.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,14 @@ func Ping() error {
319319
return x.Ping()
320320
}
321321

322-
// DumpDatabase dumps all data from database to file system.
323-
func DumpDatabase(filePath string) error {
324-
return x.DumpAllToFile(filePath)
322+
// DumpDatabase dumps all data from database according the special database SQL syntax to file system.
323+
func DumpDatabase(filePath string, dbType string) error {
324+
var tbs []*core.Table
325+
for _, t := range tables {
326+
tbs = append(tbs, x.TableInfo(t).Table)
327+
}
328+
if len(dbType) > 0 {
329+
return x.DumpTablesToFile(tbs, filePath, core.DbType(dbType))
330+
}
331+
return x.DumpTablesToFile(tbs, filePath)
325332
}

vendor/github.com/go-xorm/builder/README.md

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/builder.go

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/builder_delete.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/builder_insert.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/builder_select.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/builder_update.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/circle.yml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/cond.go

+18-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/cond_and.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-xorm/builder/cond_between.go

+9-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)