diff options
| author | zeripath <art27@cantab.net> | 2020-09-11 09:25:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 09:25:06 +0100 |
| commit | 25c870faa91954f86951c0e6f7ee25cff1a9869e (patch) | |
| tree | fb87f483635e4fddfc070958235c463002379049 | |
| parent | 29ac1f91223d020cd82f7d4dcb84cebec320b721 (diff) | |
| download | gitea-25c870faa91954f86951c0e6f7ee25cff1a9869e.tar.gz gitea-25c870faa91954f86951c0e6f7ee25cff1a9869e.zip | |
Whilst changing the character set to utf8mb4 we should set ROW_FORMAT=dynamic too (#12804)
Fix #12801
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | models/convert.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/models/convert.go b/models/convert.go index 025f88b503..baa63bb388 100644 --- a/models/convert.go +++ b/models/convert.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/modules/setting" ) -// ConvertUtf8ToUtf8mb4 converts database and tables from utf8 to utf8mb4 if it's mysql +// ConvertUtf8ToUtf8mb4 converts database and tables from utf8 to utf8mb4 if it's mysql and set ROW_FORMAT=dynamic func ConvertUtf8ToUtf8mb4() error { _, err := x.Exec(fmt.Sprintf("ALTER DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", setting.Database.Name)) if err != nil { @@ -22,6 +22,10 @@ func ConvertUtf8ToUtf8mb4() error { return err } for _, table := range tables { + if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` ROW_FORMAT=dynamic;", table.Name)); err != nil { + return err + } + if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;", table.Name)); err != nil { return err } |