This repository was archived by the owner on Jan 28, 2021. It is now read-only.
File tree 2 files changed +8
-3
lines changed
2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -10,11 +10,11 @@ import (
10
10
"strings"
11
11
12
12
opentracing "github.com/opentracing/opentracing-go"
13
- "gopkg.in/src-d/go-errors.v1"
14
13
"github.com/src-d/go-mysql-server/sql"
15
14
"github.com/src-d/go-mysql-server/sql/expression"
16
15
"github.com/src-d/go-mysql-server/sql/expression/function"
17
16
"github.com/src-d/go-mysql-server/sql/plan"
17
+ "gopkg.in/src-d/go-errors.v1"
18
18
"vitess.io/vitess/go/vt/sqlparser"
19
19
)
20
20
@@ -765,6 +765,10 @@ func exprToExpression(e sqlparser.Expr) (sql.Expression, error) {
765
765
return nil , err
766
766
}
767
767
768
+ if v .Distinct {
769
+ return nil , ErrUnsupportedSyntax .New ("DISTINCT on aggregations" )
770
+ }
771
+
768
772
return expression .NewUnresolvedFunction (v .Name .Lowered (),
769
773
v .IsAggregate (), exprs ... ), nil
770
774
case * sqlparser.ParenExpr :
Original file line number Diff line number Diff line change @@ -3,12 +3,12 @@ package parse
3
3
import (
4
4
"testing"
5
5
6
- errors "gopkg.in/src-d/go-errors.v1"
7
6
"github.com/src-d/go-mysql-server/sql/expression"
8
7
"github.com/src-d/go-mysql-server/sql/plan"
8
+ errors "gopkg.in/src-d/go-errors.v1"
9
9
10
- "github.com/stretchr/testify/require"
11
10
"github.com/src-d/go-mysql-server/sql"
11
+ "github.com/stretchr/testify/require"
12
12
)
13
13
14
14
var fixtures = map [string ]sql.Node {
@@ -1166,6 +1166,7 @@ var fixturesErrors = map[string]*errors.Kind{
1166
1166
`SELECT '2018-05-01' / INTERVAL 1 DAY` : ErrUnsupportedSyntax ,
1167
1167
`SELECT INTERVAL 1 DAY + INTERVAL 1 DAY` : ErrUnsupportedSyntax ,
1168
1168
`SELECT '2018-05-01' + (INTERVAL 1 DAY + INTERVAL 1 DAY)` : ErrUnsupportedSyntax ,
1169
+ `SELECT COUNT(DISTINCT foo) FROM a` : ErrUnsupportedSyntax ,
1169
1170
}
1170
1171
1171
1172
func TestParseErrors (t * testing.T ) {
You can’t perform that action at this time.
0 commit comments