Skip to content
This repository has been archived by the owner on Jan 28, 2021. It is now read-only.

sql/parse: error for unsupported distinct on aggregations #754

Merged
merged 1 commit into from
Jun 19, 2019
Merged

sql/parse: error for unsupported distinct on aggregations #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ var queries = []struct {
FROM (
SELECT
i,
COUNT(DISTINCT s) AS foo
COUNT(s) AS foo
FROM mytable
GROUP BY i
) AS q
Expand Down
6 changes: 5 additions & 1 deletion sql/parse/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"

opentracing "github.com/opentracing/opentracing-go"
"gopkg.in/src-d/go-errors.v1"
"github.com/src-d/go-mysql-server/sql"
"github.com/src-d/go-mysql-server/sql/expression"
"github.com/src-d/go-mysql-server/sql/expression/function"
"github.com/src-d/go-mysql-server/sql/plan"
"gopkg.in/src-d/go-errors.v1"
"vitess.io/vitess/go/vt/sqlparser"
)

Expand Down Expand Up @@ -765,6 +765,10 @@ func exprToExpression(e sqlparser.Expr) (sql.Expression, error) {
return nil, err
}

if v.Distinct {
return nil, ErrUnsupportedSyntax.New("DISTINCT on aggregations")
}

return expression.NewUnresolvedFunction(v.Name.Lowered(),
v.IsAggregate(), exprs...), nil
case *sqlparser.ParenExpr:
Expand Down
5 changes: 3 additions & 2 deletions sql/parse/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package parse
import (
"testing"

errors "gopkg.in/src-d/go-errors.v1"
"github.com/src-d/go-mysql-server/sql/expression"
"github.com/src-d/go-mysql-server/sql/plan"
errors "gopkg.in/src-d/go-errors.v1"

"github.com/stretchr/testify/require"
"github.com/src-d/go-mysql-server/sql"
"github.com/stretchr/testify/require"
)

var fixtures = map[string]sql.Node{
Expand Down Expand Up @@ -1166,6 +1166,7 @@ var fixturesErrors = map[string]*errors.Kind{
`SELECT '2018-05-01' / INTERVAL 1 DAY`: ErrUnsupportedSyntax,
`SELECT INTERVAL 1 DAY + INTERVAL 1 DAY`: ErrUnsupportedSyntax,
`SELECT '2018-05-01' + (INTERVAL 1 DAY + INTERVAL 1 DAY)`: ErrUnsupportedSyntax,
`SELECT COUNT(DISTINCT foo) FROM b`: ErrUnsupportedSyntax,
}

func TestParseErrors(t *testing.T) {
Expand Down