Merge pull request #4018 from eclipse/GH-4014-group-by-function

GH-4014 handle function over var declared in group by
eclipse-rdf4j · Jun 28, 2022 · 158dc0b · 158dc0b
2 parents c86966e + e4b4f75
commit 158dc0b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...ryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/TupleExprBuilder.java b/...ryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/TupleExprBuilder.java
@@ -686,8 +686,9 @@ public TupleExpr visit(ASTSelect node, Object data) throws VisitorException {
 
  private static boolean isIllegalCombinedWithGroupByExpression(ValueExpr expr, List<ProjectionElem> elements,
  Set<String> groupNames) {
- if (expr instanceof ValueConstant)
+ if (expr instanceof ValueConstant) {
  return false;
+ }
 
  VarNameCollector varNameCollector = new VarNameCollector();
  expr.visit(varNameCollector);
@@ -704,6 +705,10 @@ private static boolean isIllegalCombinedWithGroupByExpression(ValueExpr expr, Li
 
  private static boolean isIllegalCombinedWithGroupByExpression(String varName, List<ProjectionElem> elements,
  Set<String> groupNames) {
+ if (groupNames.contains(varName)) {
+ return false;
+ }
+
  do {
  String prev = varName;
 

diff --git a/...ryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java b/...ryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java
@@ -517,4 +517,14 @@ public void testGroupByProjectionHandling_renameVariableWithAggregation() {
  parser.parseQuery(query, null);
  }
 
+ @Test
+ public void testGroupByProjectionHandling_function() {
+ String query = "select (strlen(concat(strlen(?s)+2, \"abc\", count(?o))) as ?len) where { \n" +
+ "?s ?p ?o .\n" +
+ "} group by ?s";
+
+ // should parse without error
+ parser.parseQuery(query, null);
+ }
+
 }