Skip to content

Commit 18fafa9

Browse files
author
ffffwh
committed
update vendor: charset utf8mb3 #1035
1 parent 6e67993 commit 18fafa9

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ replace github.com/araddon/qlbridge => github.com/ffffwh/qlbridge v0.0.0-2022011
5454

5555
replace github.com/pingcap/dm => github.com/actiontech/dm v0.0.0-20211206092524-9e640f6da0ac
5656

57-
replace github.com/pingcap/tidb => github.com/actiontech/tidb v0.0.0-20220928030323-1f192702a2c7
57+
replace github.com/pingcap/tidb => github.com/actiontech/tidb v0.0.0-20230330055952-b2be7d4c14e6
5858

59-
replace github.com/pingcap/tidb/parser => github.com/actiontech/tidb/parser v0.0.0-20220928030323-1f192702a2c7
59+
replace github.com/pingcap/tidb/parser => github.com/actiontech/tidb/parser v0.0.0-20230330055952-b2be7d4c14e6
6060

6161
// fix tencentcloud-sdk-go version. Try remove this line after updating nomad.
6262
replace github.com/hashicorp/go-discover => github.com/hashicorp/go-discover v0.0.0-20211203145537-8b3ddf4349a8

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ github.com/actiontech/dm v0.0.0-20211206092524-9e640f6da0ac h1:ZvIS/l64BI7e5sakt
128128
github.com/actiontech/dm v0.0.0-20211206092524-9e640f6da0ac/go.mod h1:gPUms4Idkajqx6cDBv4xntDrw0u/14FxPLDV1WIlTOg=
129129
github.com/actiontech/golang-live-coverage-report v0.0.0-20210902074032-43aa91afdc2c h1:YdIwOxw+7Y9G30zKgzQZM3gwV99Ei4HBjkOFF3O+48g=
130130
github.com/actiontech/golang-live-coverage-report v0.0.0-20210902074032-43aa91afdc2c/go.mod h1:HrlppUkZZFRbGKdtH3eN2RTzGioB0cf0QMTMg+Bm6Q8=
131-
github.com/actiontech/tidb v0.0.0-20220928030323-1f192702a2c7 h1:tk5UKS4G2QM5oh1UH85BQwh+sRp4hQR62AXFX0/P3/k=
132-
github.com/actiontech/tidb v0.0.0-20220928030323-1f192702a2c7/go.mod h1:Ol8fbcrb8unIuqAYPJCSNi6uWsjcAGo6useI9SXL67E=
133-
github.com/actiontech/tidb/parser v0.0.0-20220928030323-1f192702a2c7 h1:KVMKXywLbEToG9uIo2WMOU1gVuabK7Ra1cI0uFdqj28=
134-
github.com/actiontech/tidb/parser v0.0.0-20220928030323-1f192702a2c7/go.mod h1:MAa22tagoj7nv5b1NBcxPkc5CiUNhqj1wuSQnw4f9WE=
131+
github.com/actiontech/tidb v0.0.0-20230330055952-b2be7d4c14e6 h1:1uwcsnLiZDlcg3bZRQA+qQE/HCWyNh+HQ8yBJtI/xMw=
132+
github.com/actiontech/tidb v0.0.0-20230330055952-b2be7d4c14e6/go.mod h1:Ol8fbcrb8unIuqAYPJCSNi6uWsjcAGo6useI9SXL67E=
133+
github.com/actiontech/tidb/parser v0.0.0-20230330055952-b2be7d4c14e6 h1:egQhEN7rUsjd9+dCOEHm5Qv/f2Us/8nIQWEeAAgcKxI=
134+
github.com/actiontech/tidb/parser v0.0.0-20230330055952-b2be7d4c14e6/go.mod h1:MAa22tagoj7nv5b1NBcxPkc5CiUNhqj1wuSQnw4f9WE=
135135
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
136136
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
137137
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=

helper/tryparser/tryparser.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ func main() {
3636

3737
//sql := "drop view a.v1"
3838
//sql := "alter view a.v1 as select * from a.a"
39-
sql := "CREATE DATABASE a DEFAULT CHARACTER SET gb2312"
39+
//sql := "CREATE DATABASE a DEFAULT CHARACTER SET gb2312"
40+
sql := "CREATE TABLE `char_columns` (`id` int NOT NULL primary key , `c_char` char(255) DEFAULT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3"
4041
ast, err := p.ParseOneStmt(sql, "", "")
4142

4243
u.PanicIfErr(err)

vendor/github.com/pingcap/tidb/parser/charset/charset.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ github.com/pingcap/kvproto/pkg/span
547547
github.com/pingcap/kvproto/pkg/tikvpb
548548
# github.com/pingcap/log v0.0.0-20210906054005-afc726e70354
549549
github.com/pingcap/log
550-
# github.com/pingcap/tidb v1.1.0-beta.0.20211025024448-36e694bfc536 => github.com/actiontech/tidb v0.0.0-20220928030323-1f192702a2c7
550+
# github.com/pingcap/tidb v1.1.0-beta.0.20211025024448-36e694bfc536 => github.com/actiontech/tidb v0.0.0-20230330055952-b2be7d4c14e6
551551
## explicit
552552
github.com/pingcap/tidb/bindinfo
553553
github.com/pingcap/tidb/br/pkg/errors
@@ -673,7 +673,7 @@ github.com/pingcap/tidb-tools/pkg/table-rule-selector
673673
github.com/pingcap/tidb-tools/pkg/utils
674674
github.com/pingcap/tidb-tools/tidb-binlog/node
675675
github.com/pingcap/tidb-tools/tidb-binlog/pump_client
676-
# github.com/pingcap/tidb/parser v0.0.0-20220216061539-43e666ba7c23 => github.com/actiontech/tidb/parser v0.0.0-20220928030323-1f192702a2c7
676+
# github.com/pingcap/tidb/parser v0.0.0-20220216061539-43e666ba7c23 => github.com/actiontech/tidb/parser v0.0.0-20230330055952-b2be7d4c14e6
677677
## explicit
678678
github.com/pingcap/tidb/parser
679679
github.com/pingcap/tidb/parser/ast
@@ -1194,7 +1194,7 @@ gopkg.in/yaml.v3
11941194
# github.com/go-mysql-org/go-mysql => github.com/ffffwh/go-mysql v0.0.0-20211206100736-edbdc58f729a
11951195
# github.com/araddon/qlbridge => github.com/ffffwh/qlbridge v0.0.0-20220113095321-0b48c80b13e9
11961196
# github.com/pingcap/dm => github.com/actiontech/dm v0.0.0-20211206092524-9e640f6da0ac
1197-
# github.com/pingcap/tidb => github.com/actiontech/tidb v0.0.0-20220928030323-1f192702a2c7
1198-
# github.com/pingcap/tidb/parser => github.com/actiontech/tidb/parser v0.0.0-20220928030323-1f192702a2c7
1197+
# github.com/pingcap/tidb => github.com/actiontech/tidb v0.0.0-20230330055952-b2be7d4c14e6
1198+
# github.com/pingcap/tidb/parser => github.com/actiontech/tidb/parser v0.0.0-20230330055952-b2be7d4c14e6
11991199
# github.com/hashicorp/go-discover => github.com/hashicorp/go-discover v0.0.0-20211203145537-8b3ddf4349a8
12001200
# google.golang.org/grpc => google.golang.org/grpc v1.29.1

0 commit comments

Comments
 (0)