[Fix] Fix projection of count variable from SOQL query.

kbss-cvut · Jul 20, 2023 · b2a5df4 · b2a5df4
1 parent 9272045
commit b2a5df4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java
@@ -168,7 +168,7 @@ public void enterCount(SoqlParser.CountContext ctx) {
 
     @Override
     public void exitCount(SoqlParser.CountContext ctx) {
-        this.projectedVariable = ctx.getChild(1).getText();
+        this.projectedVariable = ctx.getChild(2).getText();
     }
 
     @Override

diff --git a/jopa-impl/src/test/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryParserTest.java b/jopa-impl/src/test/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryParserTest.java
@@ -748,4 +748,11 @@ void parseQuerySupportsLangExtractionAndComparison() {
                 "FILTER (lang(?uSingularStringAtt) = ?language) }";
         parseAndAssertEquality(soql, expectedSparql);
     }
+
+    @Test
+    void parseQuerySupportsCountById() {
+        final String soql = "SELECT COUNT(a) FROM OWLClassA a WHERE a.uri = :id";
+        final String expectedSparql = "SELECT (COUNT(?id) AS ?count) WHERE { ?id a " + strUri(Vocabulary.c_OwlClassA) + " . }";
+        parseAndAssertEquality(soql, expectedSparql);
+    }
 }