Merge pull request #29 from tahoe-lafs/zxjon22-cherries

Add default MySQL charset if not provided in the configuration file
tahoe-lafs · Oct 29, 2024 · 0ff1012 · 0ff1012
2 parents 62711fb + 2ea1013
commit 0ff1012
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/accessor/gitea/defaultAccessor.go b/accessor/gitea/defaultAccessor.go
@@ -251,8 +251,11 @@ func (accessor *DefaultAccessor) getDbDialect() (gorm.Dialector, string, error)
 		dialect = sqlite.Open(giteaDbPath)
 
 	case "mysql":
-		connstr := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
-			url.PathEscape(dbUser), url.PathEscape(dbPassword), dbHost, dbName)
+		if dbCharset == "utf8" || dbCharset == "" {
+			dbCharset = "utf8mb4"
+		}
+		connstr := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=%s&parseTime=True&loc=Local",
+			url.PathEscape(dbUser), url.PathEscape(dbPassword), dbHost, dbName, dbCharset)
 		dialect = mysql.Open(connstr)
 
 	case "postgres":