Skip to content

Commit 8eef626

Browse files
WangXiangUSTCsiddontang
authored andcommitted
add config of mysql charset (#103)
1 parent 0f93277 commit 8eef626

File tree

11 files changed

+51
-10
lines changed

11 files changed

+51
-10
lines changed

etc/river.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
my_addr = "127.0.0.1:3306"
44
my_user = "root"
55
my_pass = ""
6+
my_charset = "utf8"
67

78
# Elasticsearch address
89
es_addr = "127.0.0.1:9200"

glide.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import:
77
- package: github.com/satori/go.uuid
88
version: ^1.1.0
99
- package: github.com/siddontang/go-mysql
10-
version: 3fef0652795ca3a9d47e4af1a2f6d885e574e9bb
10+
version: ead11cac47bd127a8c667efa07f171a9143d8a25
1111
subpackages:
1212
- canal
1313
- client

river/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ type Config struct {
1717
MyAddr string `toml:"my_addr"`
1818
MyUser string `toml:"my_user"`
1919
MyPassword string `toml:"my_pass"`
20+
MyCharset string `toml:"my_charset"`
2021

2122
ESAddr string `toml:"es_addr"`
2223

river/river.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func (r *River) newCanal() error {
7979
cfg.Addr = r.c.MyAddr
8080
cfg.User = r.c.MyUser
8181
cfg.Password = r.c.MyPassword
82+
cfg.Charset = r.c.MyCharset
8283
cfg.Flavor = r.c.Flavor
8384

8485
cfg.ServerID = r.c.ServerID
@@ -234,6 +235,7 @@ func (r *River) prepareRule() error {
234235
if len(rule.TableInfo.PKColumns) == 0 {
235236
return errors.Errorf("%s.%s must have a PK for a column", rule.Schema, rule.Table)
236237
}
238+
237239
}
238240

239241
return nil

river/river_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func (s *riverTestSuite) SetUpSuite(c *C) {
5959
cfg.MyAddr = *my_addr
6060
cfg.MyUser = "root"
6161
cfg.MyPassword = ""
62+
cfg.MyCharset = "utf8"
6263
cfg.ESAddr = *es_addr
6364

6465
cfg.ServerID = 1001
@@ -121,7 +122,7 @@ func (s *riverTestSuite) TestConfig(c *C) {
121122
my_addr = "127.0.0.1:3306"
122123
my_user = "root"
123124
my_pass = ""
124-
125+
my_charset = "utf8"
125126
es_addr = "127.0.0.1:9200"
126127
127128
data_dir = "./var"

vendor/github.com/siddontang/go-mysql/canal/canal.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/siddontang/go-mysql/canal/config.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/siddontang/go-mysql/dump/dump.go

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/siddontang/go-mysql/replication/binlogsyncer.go

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/siddontang/go-mysql/replication/parser.go

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)