From 099215a0609b5539918d8a081506986791df260b Mon Sep 17 00:00:00 2001 From: Laurettta Date: Thu, 5 Nov 2026 09:17:05 +0000 Subject: [PATCH] [7.x.x] typed for variable no longer failson an empty return Closes https://github.com/eXist-db/exist/issues/5050 --- .../src/main/java/org/exist/xquery/ForExpr.java | 12 ++++++------ .../src/test/java/org/exist/xquery/XQueryTest.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/exist-core/src/main/java/org/exist/xquery/ForExpr.java b/exist-core/src/main/java/org/exist/xquery/ForExpr.java index 9fcf13437c..8f5433863c 100644 --- a/exist-core/src/main/java/org/exist/xquery/ForExpr.java +++ b/exist-core/src/main/java/org/exist/xquery/ForExpr.java @@ -192,12 +192,12 @@ public Sequence eval(Sequence contextSequence, Item contextItem) if (sequenceType != null) { //Type.EMPTY is *not* a subtype of other types ; checking cardinality first //only a check on empty sequence is accurate here - if (resultSequence.isEmpty() && - !sequenceType.getCardinality().isSuperCardinalityOrEqualOf(Cardinality.EMPTY_SEQUENCE)) - {throw new XPathException(this, ErrorCodes.XPTY0004, - "Invalid cardinality for variable $" + varName + ". Expected " + - sequenceType.getCardinality().getHumanDescription() + - ", got " + Cardinality.EMPTY_SEQUENCE.getHumanDescription());} +// if (resultSequence.isEmpty() && +// !sequenceType.getCardinality().isSuperCardinalityOrEqualOf(Cardinality.EMPTY_SEQUENCE)) +// {throw new XPathException(this, ErrorCodes.XPTY0004, +// "Invalid cardinality for variable $" + varName + ". Expected " + +// sequenceType.getCardinality().getHumanDescription() + +// ", got " + Cardinality.EMPTY_SEQUENCE.getHumanDescription());} //TODO : ignore nodes right now ; they are returned as xs:untypedAtomicType if (!Type.subTypeOf(sequenceType.getPrimaryType(), Type.NODE)) { if (!resultSequence.isEmpty() && diff --git a/exist-core/src/test/java/org/exist/xquery/XQueryTest.java b/exist-core/src/test/java/org/exist/xquery/XQueryTest.java index 0d0372f762..58ca0fecdb 100644 --- a/exist-core/src/test/java/org/exist/xquery/XQueryTest.java +++ b/exist-core/src/test/java/org/exist/xquery/XQueryTest.java @@ -2452,6 +2452,18 @@ public void wrongInvalidTypeError_1787285() throws XMLDBException { } } + @Test + public void typedForVariableWithEmptyReturn_5050() throws XMLDBException { + final String query = "for $x as xs:string in 'X' return ()"; + try (final Collection testCollection = getTestCollection()) { + final XPathQueryService service = testCollection.getService(XPathQueryService.class); + try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) { + assertEquals(0, result.getSize()); + } + } + } + + /** * Regression *