[bugfix] Allow comparison of xs:dateTime and xs:dateTimeStamp

Closes eXist-db/exist#5478

Author: adamretter

exist-core/pom.xml

@@ -678,6 +678,7 @@
                             <includes>
                                 <include>project-suppression.xml</include>
                                 <include>src/test/java/org/exist/xquery/ImportFromPkgTest.java</include>
+                                <include>src/test/java/org/exist/xquery/value/DateTimeTypesTest.java</include>
                                 <include>src/test/resources-filtered/org/exist/xquery/import-from-pkg-test.conf.xml</include>
                             </includes>
                         </licenseSet>
@@ -767,6 +768,7 @@
                                 <include>src/main/java/org/exist/xquery/functions/fn/FunUriCollection.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/system/GetUptime.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/system/Shutdown.java</include>
+                                <include>src/main/java/org/exist/xquery/value/AbstractDateTimeValue.java</include>
                                 <include>src/main/java/org/exist/xquery/value/Type.java</include>
                                 <include>src/main/java/org/exist/xslt/EXistURIResolver.java</include>
                                 <include>src/main/resources-filtered/org/exist/system.properties</include>
@@ -891,6 +893,8 @@
                                 <exclude>src/main/java/org/exist/xquery/functions/fn/FunUriCollection.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/system/GetUptime.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/system/Shutdown.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/value/AbstractDateTimeValue.java</exclude>
+                                <exclude>src/test/java/org/exist/xquery/value/DateTimeTypesTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/value/Type.java</exclude>
                                 <exclude>src/main/java/org/exist/xslt/EXistURIResolver.java</exclude>
                                 <exclude>src/main/resources-filtered/org/exist/system.properties</exclude>

exist-core/src/main/java/org/exist/xquery/value/AbstractDateTimeValue.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -45,6 +69,7 @@
 import java.util.regex.Pattern;
 
 /**
+ * @author <a href="mailto:[email protected]">Adam Retter</a>
  * @author wolf
  * @author <a href="mailto:[email protected]">Piotr Kaminski</a>
  * @author ljo
@@ -363,7 +388,7 @@ public boolean compareTo(Collator collator, Comparison operator, AtomicValue oth
     }
 
     public int compareTo(Collator collator, AtomicValue other) throws XPathException {
-        if (other.getType() == getType()) {
+        if (other.getType() == getType() || other.getType() == Type.DATE_TIME_STAMP && getType() == Type.DATE_TIME || other.getType() == Type.DATE_TIME && getType() == Type.DATE_TIME_STAMP) {
             // filling in missing timezones with local timezone, should be total order as per XPath 2.0 10.4
             final int r = getImplicitCalendar().compare(((AbstractDateTimeValue) other).getImplicitCalendar());
             if (r == DatatypeConstants.INDETERMINATE) {

exist-core/src/test/java/org/exist/xquery/value/DateTimeTypesTest.java

@@ -0,0 +1,49 @@
+/*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.xquery.value;
+
+import org.exist.test.ExistXmldbEmbeddedServer;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.xmldb.api.base.XMLDBException;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author <a href="mailto:[email protected]">Adam Retter</a>
+ */
+public class DateTimeTypesTest {
+
+    @ClassRule
+    public static final ExistXmldbEmbeddedServer server = new ExistXmldbEmbeddedServer(true, true, true);
+
+    @Test
+    public void compareDateTimeWithDateTimeStamp() throws XMLDBException {
+        final String result = server.executeOneValue("xs:dateTime('2024-10-07T09:56:00+01:00') <= current-dateTime()");
+        assertEquals("true", result);
+    }
+
+    @Test
+    public void compareDateTimeStampWithDateTime() throws XMLDBException {
+        final String result = server.executeOneValue("current-dateTime() <= xs:dateTime('2024-10-07T09:56:00+01:00')");
+        assertEquals("false", result);
+    }
+}