1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-17 21:08:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Handle empty character set in MariaDB compatibility (#11082)

Browse source
This commit is contained in:
ssongliu 2025-11-26 17:21:21 +08:00 • committed by GitHub
parent 0a42d4942c
commit a39dc33770
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agent/utils/mysql/client/info.go
View file

@ -3,6 +3,7 @@ package client
import ( import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"database/sql"
"errors" "errors"
"github.com/1Panel-dev/1Panel/agent/global" "github.com/1Panel-dev/1Panel/agent/global"
@ -82,8 +83,8 @@ type BackupInfo struct {
} }
type FormatCollation struct { type FormatCollation struct {
Format string `json:"format" gorm:"column:CHARACTER_SET_NAME"` Format sql.NullString `json:"format" gorm:"column:CHARACTER_SET_NAME"`
Collation string `json:"collation" gorm:"column:COLLATION_NAME"` Collation sql.NullString `json:"collation" gorm:"column:COLLATION_NAME"`
} }
type RecoverInfo struct { type RecoverInfo struct {

3
agent/utils/mysql/client/local.go
View file

@ -405,6 +405,9 @@ func (r *Local) LoadFormatCollation(timeout uint) ([]dto.MysqlFormatCollationOpt
if len(parts) != 2 { if len(parts) != 2 {
continue continue
} }
if parts[0] == "NULL" {
continue
}
if _, ok := formatMap[parts[0]]; !ok { if _, ok := formatMap[parts[0]]; !ok {
formatMap[parts[0]] = []string{parts[1]} formatMap[parts[0]] = []string{parts[1]}
} else { } else {

9
agent/utils/mysql/client/remote.go
View file

@ -421,10 +421,13 @@ func (r *Remote) LoadFormatCollation(timeout uint) ([]dto.MysqlFormatCollationOp
if err := rows.Scan(&item.Format, &item.Collation); err != nil { if err := rows.Scan(&item.Format, &item.Collation); err != nil {
return nil, err return nil, err
} }
if _, ok := formatMap[item.Format]; !ok { if !item.Format.Valid {
formatMap[item.Format] = []string{item.Collation} continue
}
if _, ok := formatMap[item.Format.String]; !ok {
formatMap[item.Format.String] = []string{item.Collation.String}
} else { } else {
formatMap[item.Format] = append(formatMap[item.Format], item.Collation) formatMap[item.Format.String] = append(formatMap[item.Format.String], item.Collation.String)
} }
} }
options := []dto.MysqlFormatCollationOption{} options := []dto.MysqlFormatCollationOption{}