Skip to content

Commit 835acfa

Browse files
Arne Hormannjulienschmidt
Arne Hormann
authored andcommitted
add support for fallback charsets
1 parent 65bf275 commit 835acfa

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

connection.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"errors"
1616
"net"
1717
"strconv"
18+
"strings"
1819
"time"
1920
)
2021

@@ -56,7 +57,13 @@ func (mc *mysqlConn) handleParams() (e error) {
5657
switch param {
5758
// Charset
5859
case "charset":
59-
e = mc.exec("SET NAMES " + val)
60+
charsets := strings.Split(val, ",")
61+
for _, charset := range charsets {
62+
e = mc.exec("SET NAMES " + charset)
63+
if e == nil {
64+
break
65+
}
66+
}
6067
if e != nil {
6168
return
6269
}

utils_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ var testDSNs = []struct {
2121
{"username:password@protocol(address)/dbname?param=value", "&{user:username passwd:password net:protocol addr:address dbname:dbname params:map[param:value]}"},
2222
{"user@unix(/path/to/socket)/dbname?charset=utf8", "&{user:user passwd: net:unix addr:/path/to/socket dbname:dbname params:map[charset:utf8]}"},
2323
{"user:password@tcp(localhost:5555)/dbname?charset=utf8", "&{user:user passwd:password net:tcp addr:localhost:5555 dbname:dbname params:map[charset:utf8]}"},
24+
{"user:password@tcp(localhost:5555)/dbname?charset=utf8mb4,utf8", "&{user:user passwd:password net:tcp addr:localhost:5555 dbname:dbname params:map[charset:utf8mb4,utf8]}"},
2425
{"user:password@/dbname", "&{user:user passwd:password net:tcp addr:127.0.0.1:3306 dbname:dbname params:map[]}"},
2526
{"user:p@ss(word)@tcp([de:ad:be:ef::ca:fe]:80)/dbname", "&{user:user passwd:p@ss(word) net:tcp addr:[de:ad:be:ef::ca:fe]:80 dbname:dbname params:map[]}"},
2627
{"/dbname", "&{user: passwd: net:tcp addr:127.0.0.1:3306 dbname:dbname params:map[]}"},

0 commit comments

Comments
 (0)