Repository: jena Updated Branches: refs/heads/master be13685c1 -> d26c634f6
Fix and test for JENA-1246 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3a9fee0 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3a9fee0 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3a9fee0 Branch: refs/heads/master Commit: d3a9fee08980e0aed7ca9a2c802f01639ae784a0 Parents: be13685 Author: Claude Warren <cla...@apache.org> Authored: Sat Oct 15 14:25:57 2016 +0100 Committer: Claude Warren <cla...@apache.org> Committed: Sat Oct 15 14:25:57 2016 +0100 ---------------------------------------------------------------------- .../jena/arq/querybuilder/handlers/SelectHandler.java | 1 + .../arq/querybuilder/handlers/SelectHandlerTest.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d3a9fee0/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java index 8875cd3..a42f305 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java @@ -124,6 +124,7 @@ public class SelectHandler implements Handler { try { ARQParser parser = new ARQParser(new StringReader("SELECT " + s)); parser.setQuery(new Query()); + parser.getQuery().setPrefixMapping( query.getPrefixMapping()); parser.SelectClause(); Query q = parser.getQuery(); VarExprList vel = q.getProject(); http://git-wip-us.apache.org/repos/asf/jena/blob/d3a9fee0/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java index 6e131de..fbd3c13 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java @@ -26,6 +26,7 @@ import org.apache.jena.sparql.expr.E_Random; import org.apache.jena.sparql.expr.Expr; import org.apache.jena.sparql.expr.ExprAggregator; import org.apache.jena.sparql.expr.aggregate.AggCount; +import org.apache.jena.sparql.expr.aggregate.AggSum; import org.apache.jena.sparql.syntax.ElementGroup; import org.junit.Before; import org.junit.Test; @@ -71,6 +72,19 @@ public class SelectHandlerTest extends AbstractHandlerTest { } @Test + public void testAddStringWithPrefixVar() { + query.setPrefix( "xsd","http://www.w3.org/2001/XMLSchema#"; ); + Var v = Var.alloc("foo"); + handler.addVar("sum(xsd:integer(?V3))", v); + VarExprList expr = query.getProject(); + assertEquals(1, expr.size()); + Expr e = expr.getExpr( Var.alloc( "foo" )); + assertNotNull( "expression should not be null", e ); + assertTrue( "Should be an ExprAggregator", e instanceof ExprAggregator); + assertTrue( "Should contain an AggSum", ((ExprAggregator)e).getAggregator() instanceof AggSum); + } + + @Test public void testAddAggregateStringVar() { Var v = Var.alloc("foo"); handler.addVar("count(*)", v);
