try to fix flaky mysql test

wxiaoguang · wxiaoguang · commit 145fb482f005 · 2024-11-18T10:30:47.000+08:00
diff --git a/models/db/collation.go b/models/db/collation.go
@@ -68,7 +68,8 @@ func CheckCollations(x *xorm.Engine) (*CheckCollationsResult, error) {
 
 	var candidateCollations []string
 	if x.Dialect().URI().DBType == schemas.MYSQL {
-		if _, err = x.SQL("SELECT @@collation_database").Get(&res.DatabaseCollation); err != nil {
+		_, err = x.SQL("SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '?'", setting.Database.Name).Get(&res.DatabaseCollation)
+		if err != nil {
 			return nil, err
 		}
 		res.IsCollationCaseSensitive = func(s string) bool {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ func CheckCollations(x xorm.Engine) (CheckCollationsResult, error) {`
`68`	`68`
`69`	`69`	`var candidateCollations []string`
`70`	`70`	`if x.Dialect().URI().DBType == schemas.MYSQL {`
`71`		`- if _, err = x.SQL("SELECT @@collation_database").Get(&res.DatabaseCollation); err != nil {`
	`71`	`+ _, err = x.SQL("SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '?'", setting.Database.Name).Get(&res.DatabaseCollation)`
	`72`	`+ if err != nil {`
`72`	`73`	`return nil, err`
`73`	`74`	`}`
`74`	`75`	`res.IsCollationCaseSensitive = func(s string) bool {`