Merge pull request #1630 from adamretter/hotfix/qname-error-code

[bugfix] Inability compare a QName should result in XPTY0004
eXist-db · Nov 27, 2017 · 4aba29f · 4aba29f
2 parents cc88a66 + 7999a1f
commit 4aba29f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/org/exist/xquery/value/QNameValue.java b/src/org/exist/xquery/value/QNameValue.java
@@ -154,9 +154,8 @@ public boolean compareTo(Collator collator, Comparison operator, AtomicValue oth
                     throw new XPathException(ErrorCodes.XPTY0004, "cannot apply operator to QName");
             }
         } else {
-            throw new XPathException(
-                    "Type error: cannot compare QName to "
-                            + Type.getTypeName(other.getType()));
+            throw new XPathException(ErrorCodes.XPTY0004, "Type error: cannot compare QName to "
+                    + Type.getTypeName(other.getType()));
         }
     }
 

diff --git a/test/src/xquery/namespaces.xql b/test/src/xquery/namespaces.xql
@@ -259,4 +259,16 @@ function nt:ns-default-constructor() {
                 element stuff {$n}
         }/stuff
     )
-};
+};
+
+declare
+    %test:assertError("XPTY0004")
+function nt:qname-rhs-compare() {
+    'test' eq xs:QName('test')
+};
+
+declare
+    %test:assertError("XPTY0004")
+function nt:qname-lhs-compare() {
+    xs:QName('test') eq 'test'
+};