diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-08-24 17:24:45 +0800 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-08-24 11:24:45 +0200 |
| commit | f83db078f0603c775cd1b1bb016f996b65a04835 (patch) | |
| tree | 9895f852c768d43b384ba36259b44d9506b04093 /cmd/convert.go | |
| parent | 26af3401c36e6316b81b92bf6a776bf2442d251c (diff) | |
| download | gitea-f83db078f0603c775cd1b1bb016f996b65a04835.tar.gz gitea-f83db078f0603c775cd1b1bb016f996b65a04835.zip | |
Move database settings from models to setting (#7806)
* move database settings from models to setting
* update docs
* fix checkout pr
* fix tests
* fix lint
* remove unsupported tidb options
* correct wrong variable name
* remove tidb totally
Diffstat (limited to 'cmd/convert.go')
| -rw-r--r-- | cmd/convert.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/convert.go b/cmd/convert.go index cb0510c722..23a3d8dbe9 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -31,9 +31,9 @@ func runConvert(ctx *cli.Context) error { log.Trace("AppWorkPath: %s", setting.AppWorkPath) log.Trace("Custom path: %s", setting.CustomPath) log.Trace("Log path: %s", setting.LogRootPath) - models.LoadConfigs() + setting.InitDBConfig() - if models.DbCfg.Type != "mysql" { + if !setting.Database.UseMySQL { fmt.Println("This command can only be used with a MySQL database") return nil } |