From 0f3893c5213cab2ce3c042d5db47412279e8ebd2 Mon Sep 17 00:00:00 2001 From: Leon Zhang Date: Sun, 23 Dec 2018 15:19:24 +0800 Subject: [PATCH] fix #172 compatible with mysql 5.1 1. remove Index_Comment in ShowIndex function 2. remove mysql client deps in Makefile --- Makefile | 5 ++-- database/show.go | 26 ++++++++---------- deps.sh | 6 +--- vendor/vendor.json | 68 +++++++++++++++++++++++----------------------- 4 files changed, 50 insertions(+), 55 deletions(-) diff --git a/Makefile b/Makefile index 8452f3f..075fda0 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ BUILD_TIME=`date +%Y%m%d%H%M` COMMIT_VERSION=`git rev-parse HEAD` # 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_VERSION: latest, 8.0, 5.7, 5.6, 5.5 ... # use mysql:latest as default @@ -179,7 +180,7 @@ docker: $(MYSQL_RELEASE):$(MYSQL_VERSION) @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 '.' ; \ sleep 1 ; \ done ; \ @@ -188,7 +189,7 @@ docker: .PHONY: 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 .PHONY: docker-it diff --git a/database/show.go b/database/show.go index a14a5fb..e28c1e9 100644 --- a/database/show.go +++ b/database/show.go @@ -222,24 +222,22 @@ func (db *Connector) ShowIndex(tableName string) (*TableIndexInfo, error) { null := res.Result.Map("Null") idxType := res.Result.Map("Index_type") comment := res.Result.Map("Comment") - idxComment := res.Result.Map("Index_comment") // 获取值 for _, row := range res.Rows { value := TableIndexRow{ - Table: row.Str(table), - NonUnique: row.Int(unique), - KeyName: row.Str(keyName), - SeqInIndex: row.Int(seq), - ColumnName: row.Str(cName), - Collation: row.Str(collation), - Cardinality: row.Int(cardinality), - SubPart: row.Int(subPart), - Packed: row.Int(packed), - Null: row.Str(null), - IndexType: row.Str(idxType), - Comment: row.Str(comment), - IndexComment: row.Str(idxComment), + Table: row.Str(table), + NonUnique: row.Int(unique), + KeyName: row.Str(keyName), + SeqInIndex: row.Int(seq), + ColumnName: row.Str(cName), + Collation: row.Str(collation), + Cardinality: row.Int(cardinality), + SubPart: row.Int(subPart), + Packed: row.Int(packed), + Null: row.Str(null), + IndexType: row.Str(idxType), + Comment: row.Str(comment), } tbIndex.IdxRows = append(tbIndex.IdxRows, value) } diff --git a/deps.sh b/deps.sh index d1a66c2..68b5b4a 100755 --- a/deps.sh +++ b/deps.sh @@ -1,6 +1,6 @@ #!/bin/bash -NEEDED_COMMANDS="mysql docker git go govendor retool" +NEEDED_COMMANDS="docker git go govendor retool" for cmd in ${NEEDED_COMMANDS} ; do if ! command -v "${cmd}" &> /dev/null ; then @@ -11,10 +11,6 @@ for cmd in ${NEEDED_COMMANDS} ; do fi done -# MySQL client -## Mac OS: brew install mysql -## Ubuntu: apt-get install mysql-client - # Docker ## https://www.docker.com diff --git a/vendor/vendor.json b/vendor/vendor.json index 45b21f9..299989e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -167,44 +167,44 @@ { "checksumSHA1": "+0bf1l46m6GG7JtACNufnZG0OUw=", "path": "github.com/pingcap/tidb/sessionctx/stmtctx", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "kXyszfR2fQ6bHvuCCFlHRkt1mF0=", "path": "github.com/pingcap/tidb/types", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "path": "github.com/pingcap/tidb/types/json", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=", "path": "github.com/pingcap/tidb/types/parser_driver", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "s709bhSrG2Ec35406mGtrySid4s=", "path": "github.com/pingcap/tidb/util/execdetails", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "path": "github.com/pingcap/tidb/util/hack", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "path": "github.com/pingcap/tidb/util/memory", - "revision": "20a468d558505d4643ce38fa59fa7884099b5a08", - "revisionTime": "2018-12-21T11:27:58Z" + "revision": "ef7082da1cb2da10bee4ad70eb6ec9412bc96a90", + "revisionTime": "2018-12-22T14:19:41Z" }, { "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", @@ -401,62 +401,62 @@ { "checksumSHA1": "aKn1oKcY74N8TRLm3Ayt7Q4bbI4=", "path": "vitess.io/vitess/go/bytes2", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "JVCEN4UGRmg3TofIBdzZMZ3G0Ww=", "path": "vitess.io/vitess/go/hack", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "F5pcGq+2W1FHEjgktTdKOE6W8mk=", "path": "vitess.io/vitess/go/sqltypes", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "ntFIQYkBS51G6y+FEkjFW40+HOU=", "path": "vitess.io/vitess/go/vt/log", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "tPQFPwbMdjuX0qjNl4Zl8zc37JQ=", "path": "vitess.io/vitess/go/vt/proto/query", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "o0tR/c7lgr0pLkxk7CdvjiNDAKU=", "path": "vitess.io/vitess/go/vt/proto/topodata", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "77UojBqi0yyeQvR70j7C3kcKclQ=", "path": "vitess.io/vitess/go/vt/proto/vtgate", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "QpWGhoVDwM+8+sgYLI/YU+95iGU=", "path": "vitess.io/vitess/go/vt/proto/vtrpc", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "IDe+9Bn42lZVsuoYO/epdguiErk=", "path": "vitess.io/vitess/go/vt/sqlparser", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" }, { "checksumSHA1": "Jx+gOh/kiBDSZxEIWHyYn9brjdo=", "path": "vitess.io/vitess/go/vt/vterrors", - "revision": "1cf2530230d76e3bfa1ce99a51163de960ec57e2", - "revisionTime": "2018-12-21T16:58:43Z" + "revision": "23f135ea6e773f3cc7c43c3d10c482b2221e9db9", + "revisionTime": "2018-12-22T19:18:51Z" } ], "rootPath": "github.com/XiaoMi/soar" -- GitLab