Skip to content

Fix comparison of xs:unsignedLong to xs:decimal #2560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristianGruen merged 1 commit into from
Dec 8, 2025
+11 −3
Merged

Fix comparison of xs:unsignedLong to xs:decimal #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions basex-core/src/main/java/org/basex/query/value/item/Uln.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,16 @@ public ANum round(final int prec, final RoundMode mode) {
public boolean equal(final Item item, final Collation coll, final InputInfo ii)
throws QueryException {
return item.type == AtomType.UNSIGNED_LONG ? value.equals(((Uln) item).value) :
item.type == AtomType.DOUBLE || item.type == AtomType.FLOAT ? item.equal(this, coll, ii) :
value.compareTo(BigInteger.valueOf(item.itr(ii))) == 0;
item.type == AtomType.DOUBLE || item.type == AtomType.FLOAT || item.type == AtomType.DECIMAL ?
item.equal(this, coll, ii) :
value.compareTo(BigInteger.valueOf(item.itr(ii))) == 0;
}

@Override
public int compare(final Item item, final Collation coll, final boolean transitive,
final InputInfo ii) throws QueryException {
return item.type == AtomType.UNSIGNED_LONG ? value.compareTo(((Uln) item).value) :
item.type == AtomType.DOUBLE || item.type == AtomType.FLOAT ?
item.type == AtomType.DOUBLE || item.type == AtomType.FLOAT || item.type == AtomType.DECIMAL ?
-item.compare(this, coll, transitive, ii) :
value.compareTo(BigInteger.valueOf(item.itr(ii)));
}
Expand Down
7 changes: 7 additions & 0 deletions basex-core/src/test/java/org/basex/query/simple/SimpleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ public final class SimpleTest extends QueryTest {
{ "Double 7", booleans(true), "xs:double('-INF') < 0" },
{ "Double 8", "xs:double('-inf')" },

{ "UnsignedLong 1", booleans(false), "xs:unsignedLong('3') eq 3.1"},
{ "UnsignedLong 2", booleans(false), "3.1 eq xs:unsignedLong('3')"},
{ "UnsignedLong 3", booleans(true), "xs:unsignedLong(3) lt 3.1"},
{ "UnsignedLong 4", booleans(true), "3.1 gt xs:unsignedLong(3)"},
{ "UnsignedLong 5", integers(1), "compare(3.1, xs:unsignedLong('3'))"},
{ "UnsignedLong 6", integers(-1), "compare(xs:unsignedLong('3'), 3.1)"},

{ "Annotation 1", integers(1), "declare %local:x(.1) variable $a := 1; $a" },
{ "Annotation 2", integers(1), "declare %local:x(1.) variable $a := 1; $a" },
{ "Annotation 3", "declare %local:x(.) variable $a := 1; $a" },
Expand Down