From 437ab15ef9a5cc6d70c82e8f737c6f3a97620c68 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sat, 1 Aug 2020 11:03:40 +0100 Subject: [PATCH 1/3] Increase size of the language column in language_stat In #12379 it was discovered that enry v2 has a maximum language length of 34 characters which is larger than the 30 previously provided. This PR updates the language column to 50. Fix #12379 Signed-off-by: Andrew Thornton --- models/migrations/migrations.go | 3 +- models/migrations/v145.go | 58 +++++++++++++++++++++++++++++++++ models/repo_language_stats.go | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 models/migrations/v145.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 7e1cf2f50a55f..119b508bfddb9 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -222,6 +222,8 @@ var migrations = []Migration{ NewMigration("recalculate Stars number for all user", recalculateStars), // v144 -> v145 NewMigration("update Matrix Webhook http method to 'PUT'", updateMatrixWebhookHTTPMethod), + // v145 -> v146 + NewMigration("Increase Language field to 50 in LanguageStats", increaseLanguageField), } // GetCurrentDBVersion returns the current db version @@ -464,7 +466,6 @@ func dropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin sess.Rollback() return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err) } - return sess.Commit() default: log.Fatal("Unrecognized DB") diff --git a/models/migrations/v145.go b/models/migrations/v145.go new file mode 100644 index 0000000000000..063a18098af59 --- /dev/null +++ b/models/migrations/v145.go @@ -0,0 +1,58 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "fmt" + + "code.gitea.io/gitea/modules/setting" + "xorm.io/xorm" +) + +func increaseLanguageField(x *xorm.Engine) error { + type LanguageStat struct { + Language string `xorm:"VARCHAR(50) UNIQUE(s) INDEX NOT NULL"` + } + + if err := x.Sync2(new(LanguageStat)); err != nil { + return err + } + + if setting.Database.UseSQLite3 { + // SQLite maps VARCHAR to TEXT without size so we're done + return nil + } + + // need to get the correct type for the new column + inferredTable, err := x.TableInfo(new(LanguageStat)) + if err != nil { + return err + } + column := inferredTable.GetColumn("language") + sqlType := x.Dialect().SQLType(column) + + sess := x.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + return err + } + + switch { + case setting.Database.UseMySQL: + if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat MODIFY COLUMN language %s", sqlType)); err != nil { + return err + } + case setting.Database.UseMSSQL: + if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat ALTER COLUMN language %s", sqlType)); err != nil { + return err + } + case setting.Database.UsePostgreSQL: + if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat ALTER COLUMN language %s", sqlType)); err != nil { + return err + } + } + + return sess.Commit() +} diff --git a/models/repo_language_stats.go b/models/repo_language_stats.go index a15063e25a6ed..e60e441c7ab67 100644 --- a/models/repo_language_stats.go +++ b/models/repo_language_stats.go @@ -19,7 +19,7 @@ type LanguageStat struct { RepoID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"` CommitID string IsPrimary bool - Language string `xorm:"VARCHAR(30) UNIQUE(s) INDEX NOT NULL"` + Language string `xorm:"VARCHAR(50) UNIQUE(s) INDEX NOT NULL"` Percentage float32 `xorm:"-"` Size int64 `xorm:"NOT NULL DEFAULT 0"` Color string `xorm:"-"` From d04a06dc56c03d6d7748f0378419ae1913af1109 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 2 Aug 2020 12:36:16 +0100 Subject: [PATCH 2/3] fix postgres alter command Signed-off-by: Andrew Thornton --- models/migrations/v145.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v145.go b/models/migrations/v145.go index 063a18098af59..4dd88445cf812 100644 --- a/models/migrations/v145.go +++ b/models/migrations/v145.go @@ -49,7 +49,7 @@ func increaseLanguageField(x *xorm.Engine) error { return err } case setting.Database.UsePostgreSQL: - if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat ALTER COLUMN language %s", sqlType)); err != nil { + if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat ALTER COLUMN language TYPE %s", sqlType)); err != nil { return err } } From 83eed3f9178784f8cb768b469f18e8a0805b542f Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 4 Aug 2020 10:59:06 +0100 Subject: [PATCH 3/3] as per @lunny --- models/migrations/v145.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/migrations/v145.go b/models/migrations/v145.go index 4dd88445cf812..49c2bc4dc4c4e 100644 --- a/models/migrations/v145.go +++ b/models/migrations/v145.go @@ -8,6 +8,7 @@ import ( "fmt" "code.gitea.io/gitea/modules/setting" + "xorm.io/xorm" )