Merge pull request #2180 from dolthub/reltuk-a272734e

[auto-bump] [no-release-notes] dependency by reltuk

go/cmd/dolt/commands/sql.go

@@ -1334,7 +1334,7 @@ func insertsIntoAutoIncrementCol(ctx *sql.Context, se *sqlEngine, query string)
 	plan.Inspect(a, func(n sql.Node) bool {
 		switch n := n.(type) {
 		case *plan.InsertInto:
-			_, err = plan.TransformExpressionsUp(ctx, n.Source, func(exp sql.Expression) (sql.Expression, error) {
+			_, err = plan.TransformExpressionsUp(n.Source, func(exp sql.Expression) (sql.Expression, error) {
 				if _, ok := exp.(*expression.AutoIncrement); ok {
 					isAutoInc = true
 				}

go/go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078
 	github.com/dolthub/fslock v0.0.3
-	github.com/dolthub/go-mysql-server v0.10.1-0.20210924182047-42614db66e8d
+	github.com/dolthub/go-mysql-server v0.10.1-0.20210924222709-a272734ef733
 	github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446
 	github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81

go/go.sum

@@ -144,8 +144,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.10.1-0.20210924182047-42614db66e8d h1:atqTVefmAPwYOFN71ftrbEoQBdKTXQlZ+xUQrAOdhTA=
-github.com/dolthub/go-mysql-server v0.10.1-0.20210924182047-42614db66e8d/go.mod h1:4tCPtzL2cJKkVZcmhD+MEE5SGAj1lBNvZ0mRPNLwKwY=
+github.com/dolthub/go-mysql-server v0.10.1-0.20210924222709-a272734ef733 h1:q/VvwbALXFYbtrXKoLXAvx5AVMuwR959PdJ/EZpezEY=
+github.com/dolthub/go-mysql-server v0.10.1-0.20210924222709-a272734ef733/go.mod h1:4tCPtzL2cJKkVZcmhD+MEE5SGAj1lBNvZ0mRPNLwKwY=
 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 h1:0ol5pj+QlKUKAtqs1LiPM3ZJKs+rHPgLSsMXmhTrCAM=
 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxPmiuOTndT+lUWUeGjx6eoNOK9O4tQQQ=

go/libraries/doltcore/sqle/dfunctions/active_branch.go

@@ -29,7 +29,7 @@ type ActiveBranchFunc struct {
 }
 
 // NewActiveBranchFunc creates a new ActiveBranchFunc expression.
-func NewActiveBranchFunc(ctx *sql.Context) sql.Expression {
+func NewActiveBranchFunc() sql.Expression {
 	return &ActiveBranchFunc{}
 }
 
@@ -88,9 +88,9 @@ func (*ActiveBranchFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (ab *ActiveBranchFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (ab *ActiveBranchFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 0 {
 		return nil, sql.ErrInvalidChildrenNumber.New(ab, len(children), 0)
 	}
-	return NewActiveBranchFunc(ctx), nil
+	return NewActiveBranchFunc(), nil
 }

go/libraries/doltcore/sqle/dfunctions/commit.go

@@ -32,7 +32,7 @@ type CommitFunc struct {
 }
 
 // NewCommitFunc creates a new CommitFunc expression.
-func NewCommitFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewCommitFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &CommitFunc{children: args}, nil
 }
 
@@ -151,8 +151,8 @@ func (cf *CommitFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (cf *CommitFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewCommitFunc(ctx, children...)
+func (cf *CommitFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewCommitFunc(children...)
 }
 
 func (cf *CommitFunc) Type() sql.Type {

go/libraries/doltcore/sqle/dfunctions/dolt_add.go

@@ -121,11 +121,11 @@ func (d DoltAddFunc) Children() []sql.Expression {
 	return d.children
 }
 
-func (d DoltAddFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewDoltAddFunc(ctx, children...)
+func (d DoltAddFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewDoltAddFunc(children...)
 }
 
 // NewDoltAddFunc creates a new DoltAddFunc expression whose children represents the args passed in DOLT_ADD.
-func NewDoltAddFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewDoltAddFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltAddFunc{children: args}, nil
 }

go/libraries/doltcore/sqle/dfunctions/dolt_checkout.go

@@ -188,10 +188,10 @@ func (d DoltCheckoutFunc) Type() sql.Type {
 	return sql.Int8
 }
 
-func (d DoltCheckoutFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewDoltCheckoutFunc(ctx, children...)
+func (d DoltCheckoutFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewDoltCheckoutFunc(children...)
 }
 
-func NewDoltCheckoutFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewDoltCheckoutFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltCheckoutFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }

go/libraries/doltcore/sqle/dfunctions/dolt_commit.go

@@ -36,7 +36,7 @@ type DoltCommitFunc struct {
 }
 
 // NewDoltCommitFunc creates a new DoltCommitFunc expression whose children represents the args passed in DOLT_COMMIT.
-func NewDoltCommitFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewDoltCommitFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltCommitFunc{children: args}, nil
 }
 
@@ -163,8 +163,8 @@ func (d DoltCommitFunc) IsNullable() bool {
 	return false
 }
 
-func (d DoltCommitFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewDoltCommitFunc(ctx, children...)
+func (d DoltCommitFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewDoltCommitFunc(children...)
 }
 
 func (d DoltCommitFunc) Resolved() bool {

go/libraries/doltcore/sqle/dfunctions/dolt_fetch.go

@@ -40,7 +40,7 @@ type DoltFetchFunc struct {
 }
 
 // NewFetchFunc creates a new FetchFunc expression.
-func NewFetchFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewFetchFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltFetchFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }
 
@@ -58,8 +58,8 @@ func (d DoltFetchFunc) Type() sql.Type {
 	return sql.Boolean
 }
 
-func (d DoltFetchFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewFetchFunc(ctx, children...)
+func (d DoltFetchFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewFetchFunc(children...)
 }
 
 func (d DoltFetchFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {

go/libraries/doltcore/sqle/dfunctions/dolt_merge.go

@@ -406,10 +406,10 @@ func (d DoltMergeFunc) Type() sql.Type {
 	return sql.Boolean
 }
 
-func (d DoltMergeFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewDoltMergeFunc(ctx, children...)
+func (d DoltMergeFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewDoltMergeFunc(children...)
 }
 
-func NewDoltMergeFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewDoltMergeFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltMergeFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }

go/libraries/doltcore/sqle/dfunctions/dolt_merge_base.go

@@ -32,7 +32,7 @@ type MergeBase struct {
 }
 
 // NewMergeBase returns a MergeBase sql function.
-func NewMergeBase(ctx *sql.Context, left, right sql.Expression) sql.Expression {
+func NewMergeBase(left, right sql.Expression) sql.Expression {
 	return &MergeBase{expression.BinaryExpression{Left: left, Right: right}}
 }
 
@@ -116,9 +116,9 @@ func (d MergeBase) Type() sql.Type {
 }
 
 // WithChildren implements the sql.Expression interface.
-func (d MergeBase) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (d MergeBase) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 2 {
 		return nil, sql.ErrInvalidChildrenNumber.New(d, len(children), 2)
 	}
-	return NewMergeBase(ctx, children[0], children[1]), nil
+	return NewMergeBase(children[0], children[1]), nil
 }

go/libraries/doltcore/sqle/dfunctions/dolt_pull.go

@@ -39,7 +39,7 @@ type DoltPullFunc struct {
 }
 
 // NewPullFunc creates a new PullFunc expression.
-func NewPullFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewPullFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltPullFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }
 
@@ -57,8 +57,8 @@ func (d DoltPullFunc) Type() sql.Type {
 	return sql.Boolean
 }
 
-func (d DoltPullFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewPullFunc(ctx, children...)
+func (d DoltPullFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewPullFunc(children...)
 }
 
 func (d DoltPullFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {

go/libraries/doltcore/sqle/dfunctions/dolt_push.go

@@ -36,7 +36,7 @@ type DoltPushFunc struct {
 }
 
 // NewPushFunc creates a new PushFunc expression.
-func NewPushFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewPushFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &DoltPushFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }
 
@@ -54,8 +54,8 @@ func (d DoltPushFunc) Type() sql.Type {
 	return sql.Boolean
 }
 
-func (d DoltPushFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewPushFunc(ctx, children...)
+func (d DoltPushFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewPushFunc(children...)
 }
 
 func (d DoltPushFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {

go/libraries/doltcore/sqle/dfunctions/dolt_reset.go

@@ -150,10 +150,10 @@ func (d DoltResetFunc) Children() []sql.Expression {
 	return d.children
 }
 
-func (d DoltResetFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewDoltResetFunc(ctx, children...)
+func (d DoltResetFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewDoltResetFunc(children...)
 }
 
-func NewDoltResetFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewDoltResetFunc(args ...sql.Expression) (sql.Expression, error) {
 	return DoltResetFunc{children: args}, nil
 }

go/libraries/doltcore/sqle/dfunctions/hashof.go

@@ -35,7 +35,7 @@ type HashOf struct {
 }
 
 // NewHashOf creates a new HashOf expression.
-func NewHashOf(ctx *sql.Context, e sql.Expression) sql.Expression {
+func NewHashOf(e sql.Expression) sql.Expression {
 	return &HashOf{expression.UnaryExpression{Child: e}}
 }
 
@@ -160,11 +160,11 @@ func (t *HashOf) IsNullable() bool {
 }
 
 // WithChildren implements the Expression interface.
-func (t *HashOf) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (t *HashOf) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 1 {
 		return nil, sql.ErrInvalidChildrenNumber.New(t, len(children), 1)
 	}
-	return NewHashOf(ctx, children[0]), nil
+	return NewHashOf(children[0]), nil
 }
 
 // Type implements the Expression interface.

go/libraries/doltcore/sqle/dfunctions/merge.go

@@ -35,7 +35,7 @@ type MergeFunc struct {
 }
 
 // NewMergeFunc creates a new MergeFunc expression.
-func NewMergeFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewMergeFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &MergeFunc{children: args}, nil
 }
 
@@ -250,8 +250,8 @@ func (cf *MergeFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (cf *MergeFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewMergeFunc(ctx, children...)
+func (cf *MergeFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewMergeFunc(children...)
 }
 
 // Type implements the Expression interface.

go/libraries/doltcore/sqle/dfunctions/reset.go

@@ -36,7 +36,7 @@ type ResetFunc struct {
 }
 
 // NewDoltResetFunc creates a new ResetFunc expression.
-func NewResetFunc(ctx *sql.Context, e sql.Expression) sql.Expression {
+func NewResetFunc(e sql.Expression) sql.Expression {
 	return ResetFunc{expression.UnaryExpression{Child: e}}
 }
 
@@ -94,11 +94,11 @@ func (rf ResetFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (rf ResetFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (rf ResetFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 1 {
 		return nil, sql.ErrInvalidChildrenNumber.New(rf, len(children), 1)
 	}
-	return NewResetFunc(ctx, children[0]), nil
+	return NewResetFunc(children[0]), nil
 }
 
 // Type implements the Expression interface.

go/libraries/doltcore/sqle/dfunctions/revert.go

@@ -39,7 +39,7 @@ type RevertFunc struct {
 var _ sql.Expression = (*RevertFunc)(nil)
 
 // NewRevertFunc creates a new RevertFunc expression that reverts commits.
-func NewRevertFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewRevertFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &RevertFunc{expression.NaryExpression{ChildExpressions: args}}, nil
 }
 
@@ -133,7 +133,7 @@ func (r *RevertFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			expressions = append(expressions, expression.NewLiteral("--author", stringType), expression.NewLiteral(author, stringType))
 		}
 
-		commitFunc, err := NewDoltCommitFunc(ctx, expressions...)
+		commitFunc, err := NewDoltCommitFunc(expressions...)
 		if err != nil {
 			return nil, err
 		}
@@ -179,6 +179,6 @@ func (r *RevertFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (r *RevertFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
-	return NewRevertFunc(ctx, children...)
+func (r *RevertFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewRevertFunc(children...)
 }

go/libraries/doltcore/sqle/dfunctions/squash.go

@@ -30,7 +30,7 @@ type SquashFunc struct {
 	expression.UnaryExpression
 }
 
-func NewSquashFunc(ctx *sql.Context, child sql.Expression) sql.Expression {
+func NewSquashFunc(child sql.Expression) sql.Expression {
 	return &SquashFunc{expression.UnaryExpression{Child: child}}
 }
 
@@ -113,10 +113,10 @@ func (s SquashFunc) Children() []sql.Expression {
 	return []sql.Expression{s.Child}
 }
 
-func (s SquashFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (s SquashFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 1 {
 		return nil, sql.ErrInvalidChildrenNumber.New(s, len(children), 1)
 	}
 
-	return NewSquashFunc(ctx, children[0]), nil
+	return NewSquashFunc(children[0]), nil
 }

go/libraries/doltcore/sqle/dfunctions/verify_constraints.go

@@ -41,12 +41,12 @@ type ConstraintsVerifyFunc struct {
 var _ sql.Expression = (*ConstraintsVerifyFunc)(nil)
 
 // NewConstraintsVerifyFunc creates a new ConstraintsVerifyFunc expression that verifies the diff.
-func NewConstraintsVerifyFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewConstraintsVerifyFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &ConstraintsVerifyFunc{expression.NaryExpression{ChildExpressions: args}, false}, nil
 }
 
 // NewConstraintsVerifyAllFunc creates a new ConstraintsVerifyFunc expression that verifies all rows.
-func NewConstraintsVerifyAllFunc(ctx *sql.Context, args ...sql.Expression) (sql.Expression, error) {
+func NewConstraintsVerifyAllFunc(args ...sql.Expression) (sql.Expression, error) {
 	return &ConstraintsVerifyFunc{expression.NaryExpression{ChildExpressions: args}, true}, nil
 }
 
@@ -149,10 +149,10 @@ func (vc *ConstraintsVerifyFunc) Children() []sql.Expression {
 }
 
 // WithChildren implements the Expression interface.
-func (vc *ConstraintsVerifyFunc) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (vc *ConstraintsVerifyFunc) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if vc.isAll {
-		return NewConstraintsVerifyAllFunc(ctx, children...)
+		return NewConstraintsVerifyAllFunc(children...)
 	} else {
-		return NewConstraintsVerifyFunc(ctx, children...)
+		return NewConstraintsVerifyFunc(children...)
 	}
 }

go/libraries/doltcore/sqle/dfunctions/version.go

@@ -23,7 +23,7 @@ var VersionString = "SET_BY_INIT"
 type Version struct{}
 
 // NewVersion creates a new Version expression.
-func NewVersion(ctx *sql.Context) sql.Expression {
+func NewVersion() sql.Expression {
 	return &Version{}
 }
 
@@ -58,9 +58,9 @@ func (*Version) Type() sql.Type {
 }
 
 // WithChildren implements the Expression interface.
-func (v *Version) WithChildren(ctx *sql.Context, children ...sql.Expression) (sql.Expression, error) {
+func (v *Version) WithChildren(children ...sql.Expression) (sql.Expression, error) {
 	if len(children) != 0 {
 		return nil, sql.ErrInvalidChildrenNumber.New(v, len(children), 0)
 	}
-	return NewVersion(ctx), nil
+	return NewVersion(), nil
 }

go/libraries/doltcore/sqle/dtables/history_table.go

@@ -207,7 +207,7 @@ func getCommitFilterFunc(ctx *sql.Context, filters []sql.Expression) (doltdb.Com
 
 func transformFilters(ctx *sql.Context, filters ...sql.Expression) []sql.Expression {
 	for i := range filters {
-		filters[i], _ = expression.TransformUp(ctx, filters[i], func(e sql.Expression) (sql.Expression, error) {
+		filters[i], _ = expression.TransformUp(filters[i], func(e sql.Expression) (sql.Expression, error) {
 			gf, ok := e.(*expression.GetField)
 			if !ok {
 				return e, nil