diff --git a/go/cmd/dolt/commands/sqlserver/logformat.go b/go/cmd/dolt/commands/sqlserver/logformat.go index 50dbe03688..2be31d461f 100755 --- a/go/cmd/dolt/commands/sqlserver/logformat.go +++ b/go/cmd/dolt/commands/sqlserver/logformat.go @@ -20,7 +20,7 @@ import ( "strings" "time" - sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" "github.com/sirupsen/logrus" ) @@ -45,8 +45,8 @@ func (l LogFormat) Format(entry *logrus.Entry) ([]byte, error) { lvl = "TRACE" } - connectionId := entry.Data[sqle.ConnectionIdLogField] - delete(entry.Data, sqle.ConnectionIdLogField) + connectionId := entry.Data[sql.ConnectionIdLogField] + delete(entry.Data, sql.ConnectionIdLogField) var dataFormat strings.Builder var i int diff --git a/go/go.mod b/go/go.mod index 3b2adf7494..1ea6d07e3d 100644 --- a/go/go.mod +++ b/go/go.mod @@ -68,7 +68,7 @@ require ( ) require ( - github.com/dolthub/go-mysql-server v0.11.1-0.20220512212424-2c1ee84d49ec + github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f github.com/google/flatbuffers v2.0.5+incompatible github.com/gosuri/uilive v0.0.4 github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6 diff --git a/go/go.sum b/go/go.sum index 5b6ded0aaa..f26cd0e68a 100755 --- a/go/go.sum +++ b/go/go.sum @@ -178,8 +178,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= -github.com/dolthub/go-mysql-server v0.11.1-0.20220512212424-2c1ee84d49ec h1:sBJRQQSPDr+d2mbuNYGSsh8vbfYkXrm1e4lgUSOy7r4= -github.com/dolthub/go-mysql-server v0.11.1-0.20220512212424-2c1ee84d49ec/go.mod h1:jfc/rO3guNfSQbyElNepEHBZ4rO3AaxKk9LMhDZa09I= +github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f h1:5qWNfqLHb15Rw30XzcVPAYbRXserHx7wCQG41+MrN14= +github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f/go.mod h1:jfc/rO3guNfSQbyElNepEHBZ4rO3AaxKk9LMhDZa09I= github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g= github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms= github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=