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 /routers/install | |
| 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 'routers/install')
| -rw-r--r-- | routers/install/install.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/install/install.go b/routers/install/install.go index a377c2950b..8e2d19c732 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -104,7 +104,7 @@ func Install(ctx *context.Context) { form.DbSchema = setting.Database.Schema form.Charset = setting.Database.Charset - curDBType := setting.Database.Type + curDBType := setting.Database.Type.String() var isCurDBTypeSupported bool for _, dbType := range setting.SupportedDatabaseTypes { if dbType == curDBType { @@ -272,7 +272,7 @@ func SubmitInstall(ctx *context.Context) { // ---- Basic checks are passed, now test configuration. // Test database setting. - setting.Database.Type = form.DbType + setting.Database.Type = setting.DatabaseType(form.DbType) setting.Database.Host = form.DbHost setting.Database.User = form.DbUser setting.Database.Passwd = form.DbPasswd @@ -392,7 +392,7 @@ func SubmitInstall(ctx *context.Context) { log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err) } } - cfg.Section("database").Key("DB_TYPE").SetValue(setting.Database.Type) + cfg.Section("database").Key("DB_TYPE").SetValue(setting.Database.Type.String()) cfg.Section("database").Key("HOST").SetValue(setting.Database.Host) cfg.Section("database").Key("NAME").SetValue(setting.Database.Name) cfg.Section("database").Key("USER").SetValue(setting.Database.User) |