Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error when GROUP BY is used in a SELECT * query #89

Merged
merged 1 commit into from
Jul 31, 2019
Merged
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
23 changes: 17 additions & 6 deletions lib/sparql.jison
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,21 @@ PrefixDecl
}
;
SelectQuery
: SelectClause DatasetClause* WhereClause SolutionModifier -> extend($1, groupDatasets($2), $3, $4)
: SelectClauseWildcard DatasetClause* WhereClause SolutionModifierNoGroup -> extend($1, groupDatasets($2), $3, $4)
| SelectClauseVars DatasetClause* WhereClause SolutionModifier -> extend($1, groupDatasets($2), $3, $4)
;
SubSelect
: SelectClause WhereClause SolutionModifier ValuesClause? -> extend($1, $2, $3, $4, { type: 'query' })
SelectClauseWildcard
: SelectClauseBase '*' -> extend($1, {variables: [new Wildcard()]})
;
SelectClauseVars
: SelectClauseBase SelectClauseItem+ -> extend($1, { variables: $2 })
;
SelectClause
: 'SELECT' ( 'DISTINCT' | 'REDUCED' )? ( SelectClauseItem+ | '*' ) -> extend({ queryType: 'SELECT', variables: $3 === '*' ? [new Wildcard()] : $3 }, $2 && ($1 = lowercase($2), $2 = {}, $2[$1] = true, $2))
SelectClauseBase
: 'SELECT' ( 'DISTINCT' | 'REDUCED' )? -> extend({ queryType: 'SELECT'}, $2 && ($1 = lowercase($2), $2 = {}, $2[$1] = true, $2))
;
SubSelect
: SelectClauseWildcard WhereClause SolutionModifierNoGroup ValuesClause? -> extend($1, $2, $3, $4, { type: 'query' })
| SelectClauseVars WhereClause SolutionModifier ValuesClause? -> extend($1, $2, $3, $4, { type: 'query' })
;
SelectClauseItem
: VAR -> toVar($1)
Expand All @@ -497,7 +505,10 @@ WhereClause
: 'WHERE'? GroupGraphPattern -> { where: $2.patterns }
;
SolutionModifier
: GroupClause? HavingClause? OrderClause? LimitOffsetClauses? -> extend($1, $2, $3, $4)
: GroupClause? SolutionModifierNoGroup -> extend($1, $2)
;
SolutionModifierNoGroup
: HavingClause? OrderClause? LimitOffsetClauses? -> extend($1, $2, $3)
;
GroupClause
: 'GROUP' 'BY' GroupCondition+ -> { group: $3 }
Expand Down