Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions enginetest/queries/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -8462,6 +8462,24 @@ order by x, y;`,
Query: `select 1 where sin(0)`,
Expected: []sql.Row{},
},
{
Query: `select acos(-2)`,
Expected: []sql.Row{
{nil},
},
},
{
Query: `select asin(-2)`,
Expected: []sql.Row{
{nil},
},
},
{
Query: `select 1 % acos(-2)`,
Expected: []sql.Row{
{nil},
},
},
}

var KeylessQueries = []QueryTest{
Expand Down Expand Up @@ -9399,6 +9417,10 @@ var ErrorQueries = []QueryErrorTest{
Query: "select * from mytable order by 999",
ExpectedErrStr: "column \"999\" could not be found in any table in scope",
},
{
Query: `select cot(0)`,
ExpectedErrStr: "DOUBLE out of range for COT",
},
}

var BrokenErrorQueries = []QueryErrorTest{
Expand Down
32 changes: 28 additions & 4 deletions sql/expression/function/math.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,12 @@ func (t *Tan) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
if err != nil {
return nil, err
}
res := math.Tan(n.(float64))
if math.IsNaN(res) {
return nil, nil
}

return math.Tan(n.(float64)), nil
return res, nil
}

// WithChildren implements sql.Expression
Expand Down Expand Up @@ -326,7 +330,12 @@ func (a *Asin) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
return nil, err
}

return math.Asin(n.(float64)), nil
res := math.Asin(n.(float64))
if math.IsNaN(res) {
return nil, nil
}

return res, nil
}

// WithChildren implements sql.Expression
Expand Down Expand Up @@ -375,7 +384,12 @@ func (a *Acos) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
return nil, err
}

return math.Acos(n.(float64)), nil
res := math.Acos(n.(float64))
if math.IsNaN(res) {
return nil, nil
}

return res, nil
}

// WithChildren implements sql.Expression
Expand Down Expand Up @@ -473,7 +487,17 @@ func (c *Cot) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
return nil, err
}

return 1.0 / math.Tan(n.(float64)), nil
tan := math.Tan(n.(float64))
if math.IsNaN(tan) {
return nil, nil
}

res := 1.0 / tan
if math.IsInf(res, 0) {
return nil, sql.ErrValueOutOfRange.New("DOUBLE", c.Name)
}

return res, nil
}

// WithChildren implements sql.Expression
Expand Down