[Enhancement #161] Support attribute language tag extraction (and com…

…parison) in SOQL.
kbss-cvut · Jun 30, 2023 · 4da0e16 · 4da0e16
1 parent 9aa93fe
commit 4da0e16
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/jopa-impl/src/main/antlr4/cz/cvut/kbss/jopa/query/soql/Soql.g4 b/jopa-impl/src/main/antlr4/cz/cvut/kbss/jopa/query/soql/Soql.g4
@@ -102,6 +102,7 @@ functionsReturningStrings
    | 'SUBSTRING' '(' stringExpression ',' simpleArithmeticExpression ',' simpleArithmeticExpression ')'
    | 'LOWER' '(' stringExpression ')'
    | 'UPPER' '(' stringExpression ')'
+   | 'LANG' '(' whereClauseParam ')'
    ;
 
 simpleArithmeticExpression

diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlConstants.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlConstants.java
@@ -121,6 +121,11 @@ public static class Functions {
          */
         public static final String FLOOR = "FLOOR";
 
+        /**
+         * Returns language tag of a literal, if it has one. Returns an empty string if it has no language tag.
+         */
+        public static final String LANG = "LANG";
+
         private Functions() {
             throw new AssertionError();
         }

diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlFunctionTranslator.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlFunctionTranslator.java
@@ -35,6 +35,7 @@ private static Map<String, String> initFunctions() {
         map.put(SoqlConstants.Functions.ABS, "ABS");
         map.put(SoqlConstants.Functions.CEIL, "CEIL");
         map.put(SoqlConstants.Functions.FLOOR, "FLOOR");
+        map.put(SoqlConstants.Functions.LANG, "lang");
         return map;
     }
 

diff --git a/jopa-impl/src/test/java/cz/cvut/kbss/jopa/environment/utils/MetamodelFactory.java b/jopa-impl/src/test/java/cz/cvut/kbss/jopa/environment/utils/MetamodelFactory.java
@@ -1286,6 +1286,7 @@ static void initOwlClassUMocks(IdentifiableEntityType<OWLClassU> et, SingularAtt
         when(et.getJavaType()).thenReturn(OWLClassU.class);
         when(id.getJavaField()).thenReturn(OWLClassU.getIdField());
         when(id.getDeclaringType()).thenReturn(et);
+        when(id.getName()).thenReturn(OWLClassU.getIdField().getName());
         when(et.getIRI()).thenReturn(IRI.create(OWLClassU.getClassIri()));
         when(et.getName()).thenReturn(OWLClassU.class.getSimpleName());
         when(et.getFieldSpecifications())

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
@@ -739,4 +739,13 @@ void parseQueryWithRelatedAttributeAndIdentifierIsCommutative() {
         parseAndAssertEquality(soqlIdFirst, expectedSparql);
         parseAndAssertEquality(soqlIdSecond, expectedSparql);
     }
+
+    @Test
+    void parseQuerySupportsLangExtractionAndComparison() {
+        final String soql = "SELECT u FROM OWLClassU u WHERE LANG(u.singularStringAtt) = :language";
+        final String expectedSparql = "SELECT ?x WHERE { ?x a " + strUri(Vocabulary.c_OwlClassU) + " . " +
+                "?x " + strUri(Vocabulary.P_U_SINGULAR_MULTILINGUAL_ATTRIBUTE) + " ?uSingularStringAtt . " +
+                "FILTER (lang(?uSingularStringAtt) = ?language) }";
+        parseAndAssertEquality(soql, expectedSparql);
+    }
 }