MID-9625: Fixed inOid and ownedByOid support of expressions

Evolveum · Apr 16, 2024 · a8e223f · a8e223f
1 parent f60cdcb
commit a8e223f
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/...c/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java b/...c/main/java/com/evolveum/midpoint/prism/impl/query/lang/PrismQueryLanguageParserImpl.java
@@ -467,6 +467,17 @@ protected ObjectFilter create(QueryParsingContext.Local context, QName matchingR
                 @Override
                 protected ObjectFilter create(QueryParsingContext.Local context, QName matchingRule,
                         SubfilterOrValueContext subfilterOrValue) throws SchemaException {
+
+                    if (subfilterOrValue.expression() != null) {
+                        var expression = parseExpression(subfilterOrValue.expression());
+                        return InOidFilterImpl.createInOid(false, expression);
+                    }
+                    if (isVariablePath(subfilterOrValue.singleValue())) {
+                        var rightPath = path(context.itemDef(), subfilterOrValue.singleValue().path());
+                        var expression = parseExpression(rightPath);
+                        return InOidFilterImpl.createInOid(false, expression);
+                    }
+
                     return InOidFilterImpl.createInOid(requireLiterals(String.class, filterName, subfilterOrValue));
                 }
             })
@@ -475,6 +486,18 @@ protected ObjectFilter create(QueryParsingContext.Local context, QName matchingR
                 @Override
                 protected ObjectFilter create(QueryParsingContext.Local context, QName matchingRule,
                         SubfilterOrValueContext subfilterOrValue) throws SchemaException {
+
+                    if (subfilterOrValue.expression() != null) {
+                        var expression = parseExpression(subfilterOrValue.expression());
+                        return InOidFilterImpl.createInOid(true, expression);
+                    }
+                    if (isVariablePath(subfilterOrValue.singleValue())) {
+                        var rightPath = path(context.itemDef(), subfilterOrValue.singleValue().path());
+                        var expression = parseExpression(rightPath);
+                        return InOidFilterImpl.createInOid(true, expression);
+                    }
+
+
                     return InOidFilterImpl.createOwnerHasOidIn(requireLiterals(String.class, filterName, subfilterOrValue));
                 }
             })