Merge branch 'zachmu/issue-439' of github.com:dolthub/go-mysql-server into zachmu/issue-439

Author: zachmu

enginetest/queries.go

@@ -1230,14 +1230,14 @@ var QueryTests = []QueryTest{
 		Expected: []sql.Row{{int64(2)}},
 	},
 	{
-		Query:    "SELECT i FROM mytable WHERE s = 'first row' ORDER BY i DESC LIMIT ?;",
+		Query: "SELECT i FROM mytable WHERE s = 'first row' ORDER BY i DESC LIMIT ?;",
 		Bindings: map[string]sql.Expression{
 			"v1": expression.NewLiteral(1, sql.Int8),
 		},
 		Expected: []sql.Row{{int64(1)}},
 	},
 	{
-		Query:    "SELECT i FROM mytable ORDER BY i LIMIT ? OFFSET 2;",
+		Query: "SELECT i FROM mytable ORDER BY i LIMIT ? OFFSET 2;",
 		Bindings: map[string]sql.Expression{
 			"v1": expression.NewLiteral(1, sql.Int8),
 			"v2": expression.NewLiteral(1, sql.Int8),

go.sum

@@ -126,6 +126,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190830154057-c17b040389b9 h1:5/jaG/gKlo3xxvUn85ReNyTlN7BvlPPsxC6sHZKjGEE=
 golang.org/x/tools v0.0.0-20190830154057-c17b040389b9/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

sql/parse/warnings.go

@@ -22,10 +22,10 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/dolthub/go-mysql-server/sql/expression"
 	errors "gopkg.in/src-d/go-errors.v1"
 
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/expression"
 	"github.com/dolthub/go-mysql-server/sql/plan"
 )