Skip to content

S
soar

m0_67397764 / soar
与 Fork 源项目一致

Fork自 Xiaomi / soar

通知 1
Star 0
Fork 0
S
soar

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 0f3893c5 编写于 作者: martianzhang's avatar martianzhang
浏览文件
操作

fix #172 compatible with mysql 5.1 

  1. remove Index_Comment in ShowIndex function
  2. remove mysql client deps in Makefile
上级 34c5c62a
隐藏空白更改
内联 并排
Showing with 50 addition and 55 deletion
Makefile
浏览文件 @ 0f3893c5
...@@ -18,6 +18,7 @@ BUILD_TIME=`date +%Y%m%d%H%M` ...@@ -18,6 +18,7 @@ BUILD_TIME=`date +%Y%m%d%H%M`
COMMIT_VERSION=`git rev-parse HEAD` COMMIT_VERSION=`git rev-parse HEAD`
# Add mysql version for testing `MYSQL_RELEASE=percona MYSQL_VERSION=5.7 make docker` # Add mysql version for testing `MYSQL_RELEASE=percona MYSQL_VERSION=5.7 make docker`
# MySQL 5.1 `MYSQL_RELEASE=vsamov/mysql-5.1.73 make docker`
# MYSQL_RELEASE: mysql, percona, mariadb ... # MYSQL_RELEASE: mysql, percona, mariadb ...
# MYSQL_VERSION: latest, 8.0, 5.7, 5.6, 5.5 ... # MYSQL_VERSION: latest, 8.0, 5.7, 5.6, 5.5 ...
# use mysql:latest as default # use mysql:latest as default
...@@ -179,7 +180,7 @@ docker: ...@@ -179,7 +180,7 @@ docker:
$(MYSQL_RELEASE):$(MYSQL_VERSION) $(MYSQL_RELEASE):$(MYSQL_VERSION)
@echo "waiting for sakila database initializing " @echo "waiting for sakila database initializing "
@while ! mysql -h 127.0.0.1 -u root sakila -p1tIsB1g3rt -NBe "do 1;" 2>/dev/null; do \ @while ! docker exec soar-mysql mysql --user=root --password=1tIsB1g3rt --host "127.0.0.1" --silent -NBe "do 1" >/dev/null 2>&1 ; do \
printf '.' ; \ printf '.' ; \
sleep 1 ; \ sleep 1 ; \
done ; \ done ; \
...@@ -188,7 +189,7 @@ docker: ...@@ -188,7 +189,7 @@ docker:
.PHONY: docker-connect .PHONY: docker-connect
docker-connect: docker-connect:
mysql -h 127.0.0.1 -u root -p1tIsB1g3rt -c docker exec -it soar-mysql mysql --user=root --password=1tIsB1g3rt --host "127.0.0.1"
# attach docker container with bash interactive mode # attach docker container with bash interactive mode
.PHONY: docker-it .PHONY: docker-it
......
database/show.go
浏览文件 @ 0f3893c5
...@@ -222,24 +222,22 @@ func (db *Connector) ShowIndex(tableName string) (*TableIndexInfo, error) { ...@@ -222,24 +222,22 @@ func (db *Connector) ShowIndex(tableName string) (*TableIndexInfo, error) {
null := res.Result.Map("Null") null := res.Result.Map("Null")
idxType := res.Result.Map("Index_type") idxType := res.Result.Map("Index_type")
comment := res.Result.Map("Comment") comment := res.Result.Map("Comment")
idxComment := res.Result.Map("Index_comment")
// 获取值 // 获取值
for _, row := range res.Rows { for _, row := range res.Rows {
value := TableIndexRow{ value := TableIndexRow{
Table: row.Str(table), Table: row.Str(table),
NonUnique: row.Int(unique), NonUnique: row.Int(unique),
KeyName: row.Str(keyName), KeyName: row.Str(keyName),
SeqInIndex: row.Int(seq), SeqInIndex: row.Int(seq),
ColumnName: row.Str(cName), ColumnName: row.Str(cName),
Collation: row.Str(collation), Collation: row.Str(collation),
Cardinality: row.Int(cardinality), Cardinality: row.Int(cardinality),
SubPart: row.Int(subPart), SubPart: row.Int(subPart),
Packed: row.Int(packed), Packed: row.Int(packed),
Null: row.Str(null), Null: row.Str(null),
IndexType: row.Str(idxType), IndexType: row.Str(idxType),
Comment: row.Str(comment), Comment: row.Str(comment),
IndexComment: row.Str(idxComment),
} }
tbIndex.IdxRows = append(tbIndex.IdxRows, value) tbIndex.IdxRows = append(tbIndex.IdxRows, value)
} }
......
deps.sh
浏览文件 @ 0f3893c5
#!/bin/bash #!/bin/bash
NEEDED_COMMANDS="mysql docker git go govendor retool" NEEDED_COMMANDS="docker git go govendor retool"
for cmd in ${NEEDED_COMMANDS} ; do for cmd in ${NEEDED_COMMANDS} ; do
if ! command -v "${cmd}" &> /dev/null ; then if ! command -v "${cmd}" &> /dev/null ; then
...@@ -11,10 +11,6 @@ for cmd in ${NEEDED_COMMANDS} ; do ...@@ -11,10 +11,6 @@ for cmd in ${NEEDED_COMMANDS} ; do
fi fi
done done
# MySQL client
## Mac OS: brew install mysql
## Ubuntu: apt-get install mysql-client
# Docker # Docker
## https://www.docker.com ## https://www.docker.com
......
vendor/vendor.json
浏览文件 @ 0f3893c5
...@@ -167,44 +167,44 @@ ...@@ -167,44 +167,44 @@
{ {
"checksumSHA1": "+0bf1l46m6GG7JtACNufnZG0OUw=", "checksumSHA1": "+0bf1l46m6GG7JtACNufnZG0OUw=",
"path": "github.com/pingcap/tidb/sessionctx/stmtctx", "path": "github.com/pingcap/tidb/sessionctx/stmtctx",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "kXyszfR2fQ6bHvuCCFlHRkt1mF0=", "checksumSHA1": "kXyszfR2fQ6bHvuCCFlHRkt1mF0=",
"path": "github.com/pingcap/tidb/types", "path": "github.com/pingcap/tidb/types",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=",
"path": "github.com/pingcap/tidb/types/json", "path": "github.com/pingcap/tidb/types/json",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=", "checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=",
"path": "github.com/pingcap/tidb/types/parser_driver", "path": "github.com/pingcap/tidb/types/parser_driver",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "s709bhSrG2Ec35406mGtrySid4s=", "checksumSHA1": "s709bhSrG2Ec35406mGtrySid4s=",
"path": "github.com/pingcap/tidb/util/execdetails", "path": "github.com/pingcap/tidb/util/execdetails",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=",
"path": "github.com/pingcap/tidb/util/hack", "path": "github.com/pingcap/tidb/util/hack",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=",
"path": "github.com/pingcap/tidb/util/memory", "path": "github.com/pingcap/tidb/util/memory",
"revision": "20a468d558505d4643ce38fa59fa7884099b5a08", "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90",
"revisionTime": "2018-12-21T11:27:58Z" "revisionTime": "2018-12-22T14:19:41Z"
}, },
{ {
"checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=",
...@@ -401,62 +401,62 @@ ...@@ -401,62 +401,62 @@
{ {
"checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=", "checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=",
"path": "vitess.io/vitess/go/bytes2", "path": "vitess.io/vitess/go/bytes2",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=", "checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=",
"path": "vitess.io/vitess/go/hack", "path": "vitess.io/vitess/go/hack",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "F5pcGq+2W1FHEjgktTdKOE6W8mk=", "checksumSHA1": "F5pcGq+2W1FHEjgktTdKOE6W8mk=",
"path": "vitess.io/vitess/go/sqltypes", "path": "vitess.io/vitess/go/sqltypes",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=", "checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=",
"path": "vitess.io/vitess/go/vt/log", "path": "vitess.io/vitess/go/vt/log",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "tPQFPwbMdjuX0qjNl4Zl8zc37JQ=", "checksumSHA1": "tPQFPwbMdjuX0qjNl4Zl8zc37JQ=",
"path": "vitess.io/vitess/go/vt/proto/query", "path": "vitess.io/vitess/go/vt/proto/query",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "o0tR/c7lgr0pLkxk7CdvjiNDAKU=", "checksumSHA1": "o0tR/c7lgr0pLkxk7CdvjiNDAKU=",
"path": "vitess.io/vitess/go/vt/proto/topodata", "path": "vitess.io/vitess/go/vt/proto/topodata",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "77UojBqi0yyeQvR70j7C3kcKclQ=", "checksumSHA1": "77UojBqi0yyeQvR70j7C3kcKclQ=",
"path": "vitess.io/vitess/go/vt/proto/vtgate", "path": "vitess.io/vitess/go/vt/proto/vtgate",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "QpWGhoVDwM+8+sgYLI/YU+95iGU=", "checksumSHA1": "QpWGhoVDwM+8+sgYLI/YU+95iGU=",
"path": "vitess.io/vitess/go/vt/proto/vtrpc", "path": "vitess.io/vitess/go/vt/proto/vtrpc",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "IDe+9Bn42lZVsuoYO/epdguiErk=", "checksumSHA1": "IDe+9Bn42lZVsuoYO/epdguiErk=",
"path": "vitess.io/vitess/go/vt/sqlparser", "path": "vitess.io/vitess/go/vt/sqlparser",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
}, },
{ {
"checksumSHA1": "Jx+gOh/kiBDSZxEIWHyYn9brjdo=", "checksumSHA1": "Jx+gOh/kiBDSZxEIWHyYn9brjdo=",
"path": "vitess.io/vitess/go/vt/vterrors", "path": "vitess.io/vitess/go/vt/vterrors",
"revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9",
"revisionTime": "2018-12-21T16:58:43Z" "revisionTime": "2018-12-22T19:18:51Z"
} }
], ],
"rootPath": "github.com/XiaoMi/soar" "rootPath": "github.com/XiaoMi/soar"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或