Skip to content

Commit

Permalink
*: support show collation radondb#677
Browse files Browse the repository at this point in the history
[summary]
support show collation
[test case]
src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/show_test.go
src/proxy/show_test.go
[patch codecov]
src/proxy/show.go 88.2%
  • Loading branch information
andyli029 committed Sep 1, 2020
1 parent 6f811eb commit 54f5d5d
Show file tree
Hide file tree
Showing 8 changed files with 2,670 additions and 2,544 deletions.
6 changes: 6 additions & 0 deletions src/proxy/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ func (spanner *Spanner) ComQuery(session *driver.Session, query string, bindVari
log.Error("proxy.JDBC.shows[%s].from.session[%v].error:%+v", query, session.ID(), err)
status = 1
}
case sqlparser.ShowCollationStr:
// Support for DBeaver.
if qr, err = spanner.handleShowCollation(session, query, node); err != nil {
log.Error("proxy.show.collation.status[%s].from.session[%v].error:%+v", query, session.ID(), err)
status = 1
}
default:
log.Error("proxy.show.unsupported[%s].from.session[%v]", query, session.ID())
status = sqldb.ER_UNKNOWN_ERROR
Expand Down
4 changes: 4 additions & 0 deletions src/proxy/show.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,3 +623,7 @@ func (spanner *Spanner) handleShowVersions(session *driver.Session, query string
func (spanner *Spanner) handleJDBCShows(session *driver.Session, query string, node sqlparser.Statement) (*sqltypes.Result, error) {
return spanner.ExecuteSingle(query)
}

func (spanner *Spanner) handleShowCollation(session *driver.Session, query string, node sqlparser.Statement) (*sqltypes.Result, error) {
return spanner.ExecuteSingle(query)
}
4 changes: 2 additions & 2 deletions src/proxy/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1198,13 +1198,13 @@ func TestProxyShowVersions(t *testing.T) {
}
}

func TestProxyShowWarnings(t *testing.T) {
func TestProxyShowSupported(t *testing.T) {
log := xlog.NewStdLog(xlog.Level(xlog.PANIC))
fakedbs, proxy, cleanup := MockProxy(log)
defer cleanup()
address := proxy.Address()

querys := []string{"show warnings", "show variables"}
querys := []string{"show warnings", "show variables", "show collation"}
// fakedbs.
{
fakedbs.AddQueryPattern("use .*", &sqltypes.Result{})
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 54f5d5d

Please sign in to comment.