Skip to content

Commit bf625c4

Browse files
committed
*: upgrade code after go-mysql-server update
Signed-off-by: Miguel Molina <[email protected]>
1 parent 9947ad0 commit bf625c4

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/function/language.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (Language) Type() sql.Type {
5353
}
5454

5555
// TransformUp implements the Expression interface.
56-
func (f *Language) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
56+
func (f *Language) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
5757
left, err := f.Left.TransformUp(fn)
5858
if err != nil {
5959
return nil, err
@@ -71,8 +71,8 @@ func (f *Language) TransformUp(fn func(sql.Expression) (sql.Expression, error))
7171
}
7272

7373
// Eval implements the Expression interface.
74-
func (f *Language) Eval(session sql.Session, row sql.Row) (interface{}, error) {
75-
left, err := f.Left.Eval(session, row)
74+
func (f *Language) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
75+
left, err := f.Left.Eval(ctx, row)
7676
if err != nil {
7777
return nil, err
7878
}
@@ -90,7 +90,7 @@ func (f *Language) Eval(session sql.Session, row sql.Row) (interface{}, error) {
9090
var blob []byte
9191

9292
if f.Right != nil {
93-
right, err := f.Right.Eval(session, row)
93+
right, err := f.Right.Eval(ctx, row)
9494
if err != nil {
9595
return nil, err
9696
}
@@ -109,3 +109,12 @@ func (f *Language) Eval(session sql.Session, row sql.Row) (interface{}, error) {
109109

110110
return enry.GetLanguage(path, blob), nil
111111
}
112+
113+
// Children implements the Expression interface.
114+
func (f *Language) Children() []sql.Expression {
115+
if f.Right == nil {
116+
return []sql.Expression{f.Left}
117+
}
118+
119+
return []sql.Expression{f.Left, f.Right}
120+
}

0 commit comments

Comments
 (0)