diff --git a/enginetest/queries/queries.go b/enginetest/queries/queries.go index 16bfe7859c..306e018b35 100644 --- a/enginetest/queries/queries.go +++ b/enginetest/queries/queries.go @@ -770,7 +770,7 @@ var QueryTests = []QueryTest{ Expected: []sql.Row{{"0"}}, }, { - Query: "SELECT * from mytable where (1/1 and true)", + Query: "SELECT * from mytable where (1/1 and true)", Expected: []sql.Row{ {1, "first row"}, {2, "second row"}, diff --git a/server/extension.go b/server/extension.go index 92a8db17ef..1831bde53e 100644 --- a/server/extension.go +++ b/server/extension.go @@ -15,13 +15,15 @@ package server import ( - sqle "github.com/dolthub/go-mysql-server" + "sort" + "github.com/dolthub/vitess/go/mysql" "github.com/dolthub/vitess/go/sqltypes" querypb "github.com/dolthub/vitess/go/vt/proto/query" "github.com/dolthub/vitess/go/vt/sqlparser" ast "github.com/dolthub/vitess/go/vt/sqlparser" - "sort" + + sqle "github.com/dolthub/go-mysql-server" ) func Intercept(h Interceptor) { diff --git a/sql/core.go b/sql/core.go index 019e10e6b2..3ffaa125e4 100644 --- a/sql/core.go +++ b/sql/core.go @@ -16,10 +16,11 @@ package sql import ( "fmt" - "github.com/shopspring/decimal" -"math" + "math" "strconv" "time" + + "github.com/shopspring/decimal" ) // Expression is a combination of one or more SQL expressions.