diff options
| author | Jason Song <i@wolfogre.com> | 2023-03-07 18:51:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 18:51:06 +0800 |
| commit | c84238800bb743181582f043ece9b44fef233c95 (patch) | |
| tree | 83cf618233bb1a51c4a3325f8fa7662bb136afb1 /cmd | |
| parent | 84a299310d9a8f6387f18a1711485b7f33e6f6b5 (diff) | |
| download | gitea-c84238800bb743181582f043ece9b44fef233c95.tar.gz gitea-c84238800bb743181582f043ece9b44fef233c95.zip | |
Refactor `setting.Database.UseXXX` to methods (#23354)
Replace #23350.
Refactor `setting.Database.UseMySQL` to
`setting.Database.Type.IsMySQL()`.
To avoid mismatching between `Type` and `UseXXX`.
This refactor can fix the bug mentioned in #23350, so it should be
backported.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/convert.go | 2 | ||||
| -rw-r--r-- | cmd/dump.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/convert.go b/cmd/convert.go index 30e7d01e11..d9b89495c1 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -35,7 +35,7 @@ func runConvert(ctx *cli.Context) error { log.Info("Log path: %s", setting.Log.RootPath) log.Info("Configuration file: %s", setting.CustomConf) - if !setting.Database.UseMySQL { + if !setting.Database.Type.IsMySQL() { fmt.Println("This command can only be used with a MySQL database") return nil } diff --git a/cmd/dump.go b/cmd/dump.go index 600ec4f32e..c802849f8e 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -279,7 +279,7 @@ func runDump(ctx *cli.Context) error { }() targetDBType := ctx.String("database") - if len(targetDBType) > 0 && targetDBType != setting.Database.Type { + if len(targetDBType) > 0 && targetDBType != setting.Database.Type.String() { log.Info("Dumping database %s => %s...", setting.Database.Type, targetDBType) } else { log.Info("Dumping database...") |