Skip to content

GH-4308: Trailing VALUES happens before SELECT expression #4309

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.

Sign up for GitHub

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

Merged
afs merged 2 commits into from
Oct 8, 2026
+25 −16
Merged

GH-4308: Trailing VALUES happens before SELECT expression #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f3b2f
Only check SELECT queries for use of SELECT *
afs Oct 6, 2026
8833d81
GH-4308: Trailing VALUES happens before SELECT expression
afs Oct 6, 2026
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
25 changes: 13 additions & 12 deletions jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@ protected Op compileModifiers(Query query, Op pattern) {
op = OpGroup.create(op, query.getGroupBy(), query.getAggregators());
}

// ---- Assignments from SELECT and other places (so available to ORDER and
// ---- Assignments from SELECT and other places
// (so available to ORDER and
// HAVING)
// Now do assignments from expressions
// Must be after "group by" has introduced it's variables.
Expand All @@ -529,8 +530,17 @@ protected Op compileModifiers(Query query, Op pattern) {
}
}

// ---- Assignments from SELECT and other places (so available to ORDER and
// HAVING)
// ---- VALUES
if ( query.hasValues() ) {
Table table = TableFactory.create(query.getValuesVariables());
for ( Binding binding : query.getValuesData() )
table.addBinding(binding);
OpTable opTable = OpTable.create(table);
op = OpJoin.create(op, opTable);
}

// ---- Assignments from SELECT and other places
// (so available to ORDER and HAVING)
for ( Var v : exprs.getVars() ) {
Expr e = exprs.getExpr(v);
op = OpExtend.create(op, v, e);
Expand All @@ -544,15 +554,6 @@ protected Op compileModifiers(Query query, Op pattern) {
op = OpFilter.filter(expr2, op);
}
}
// ---- VALUES
if ( query.hasValues() ) {
Table table = TableFactory.create(query.getValuesVariables());
for ( Binding binding : query.getValuesData() )
table.addBinding(binding);
OpTable opTable = OpTable.create(table);
op = OpJoin.create(op, opTable);
}

// ---- ToList
if ( context.isTrue(ARQ.generateToList) )
// Listify it.
Expand Down
8 changes: 7 additions & 1 deletion jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static void check(Query query) {
// - not legal in SPARQL 1.2, unclear in SPARQL 1.1
// Legal in ARQ
// Query.hasGroupBy() includes a check of aggregators
if ( !Syntax.syntaxARQ.equals(query.getSyntax()) ) {
if ( !Syntax.syntaxARQ.equals(query.getSyntax()) && query.isSelectType() ) {
if ( query.isQueryResultStar() && query.hasGroupBy() )
throw new QueryParseException("SELECT * not legal with GROUP BY", -1, -1);
}
Expand Down Expand Up @@ -147,6 +147,12 @@ private static void checkExprVarGroupBy(Query query) {
VarExprList groupKey = query.getGroupBy();
// Mutated so copy.
List<Var> inScopeVars = new ArrayList<>(groupKey.getVars());
// and trailing VALUES
if ( query.hasValues() ) {
List<Var> x = query.getValuesVariables();
inScopeVars.addAll(x);
}

VarExprList exprList = query.getProject();

// Look in the SELECT expressions
Expand Down
8 changes: 5 additions & 3 deletions jena-arq/src/test/java/org/apache/jena/sparql/lang/TestVarScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void scope_65() {
@Test
public void scope_66() {
assertThrows(QueryException.class,
()-> scope("SELECT ( (?x+1) AS ?y) (2 AS ?x) {}"));
()->scope("SELECT ( (?x+1) AS ?y) (2 AS ?x) {}"));
}

// GH-3164
Expand All @@ -165,10 +165,12 @@ public void scope_66() {
GROUP BY ?s
VALUES ?min { 2 5 }
""";
scope(qsVarScope);
assertThrows(QueryException.class,
()->scope(qsVarScope));
}

@Test public void scope_71() {
scope("SELECT (MIN(?v) as ?min) WHERE {} VALUES ?min { 2 5 }");
assertThrows(QueryException.class,
()->scope("SELECT (MIN(?v) as ?min) WHERE {} VALUES ?min { 2 5 }"));
}
}
Loading