[bugfix] Reverted "Change the return type of the current-dateTime function from datetime stamp to datetime"

Author: chris-evolvedbinary

exist-core/src/main/java/org/exist/xquery/functions/fn/FunCurrentDateTime.java

@@ -32,7 +32,7 @@
 import org.exist.xquery.Profiler;
 import org.exist.xquery.XPathException;
 import org.exist.xquery.XQueryContext;
-import org.exist.xquery.value.DateTimeValue;
+import org.exist.xquery.value.DateTimeStampValue;
 import org.exist.xquery.value.FunctionReturnSequenceType;
 import org.exist.xquery.value.Item;
 import org.exist.xquery.value.Sequence;
@@ -48,11 +48,11 @@ public class FunCurrentDateTime extends Function {
     public final static FunctionSignature fnCurrentDateTime =
         new FunctionSignature(
             new QName("current-dateTime", Function.BUILTIN_FUNCTION_NS),
-            "Returns the xs:dateTime (with timezone) that is current at some time " +
+            "Returns the xs:dateTimeStamp (with timezone) that is current at some time " +
             "during the evaluation of a query or transformation in which " +
             "fn:current-dateTime() is executed.",
             null,
-            new FunctionReturnSequenceType(Type.DATE_TIME,
+            new FunctionReturnSequenceType(Type.DATE_TIME_STAMP,
                 Cardinality.EXACTLY_ONE, "the date-time current " +
                     "within query execution time span"));
 
@@ -94,7 +94,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
                 {context.getProfiler().message(this, Profiler.START_SEQUENCES,
                     "CONTEXT ITEM", contextItem.toSequence());}
         }
-        Sequence result = new DateTimeValue(this, context.getCalendar());
+        Sequence result = new DateTimeStampValue(this, context.getCalendar());
         if (isCalledAs("current-dateTime")) {
             // do nothing, result already in right form
         } else if (isCalledAs("current-date")) {

exist-core/src/test/xquery/dates/convert-dates.xqm

@@ -25,26 +25,26 @@ module namespace fd="http://exist-db.org/xquery/test/convert-dates";
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";
 
-(: verify that we can convert xs:string to :xs:dateTime :)
+(: verify that we can convert xs:string to :xs:dateTimeStamp  :)
 declare
     %test:args("2012-06-26T23:14:22.566+02:00")
     %test:assertEquals("11:14 pm on Tuesday, June 26th, 2012")
-function fd:format-dateTime($date as xs:dateTime) {
+function fd:format-dateTimeStamp($date as xs:dateTimeStamp) {
     format-dateTime($date, "[h00]:[m00] [P] on [FNn], [MNn] [D1o], [Y]", "en", (), ())
 };
 
-(: verify that we can't convert xs:string without timezone to :xs:dateTime :)
+(: verify that we can't convert xs:string without timezone to :xs:dateTimeStamp  :)
 declare
     %test:args("2012-06-26T23:14:22.566")
     %test:assertError
-function fd:convert-date-time($date as xs:dateTime) {
+function fd:convert-date-time-stamp($date as xs:dateTimeStamp) {
     format-dateTime($date, "[h00]:[m00] [P] on [FNn], [MNn] [D1o], [Y]", "en", (), ())
 };
 
 declare
     %test:args("2022-05-17T16:24:06.003+02:00", "PT2H")
     %test:assertEquals("2022-05-17T18:24:06.003+02:00")
-function fd:add-test($date as xs:dateTime, $duration as xs:dayTimeDuration) {
+function fd:add-test($date as xs:dateTimeStamp, $duration as xs:dayTimeDuration) {
     $duration + $date
 };
 
@@ -62,44 +62,44 @@ function fd:subtract-from-dateTime-test($date1 as xs:dateTime, $date2 as xs:date
     ($date1 - $date2) cast as xs:string
 };
 
-(: verify that fn:current-dateTime() return type is xs:dateTime  :)
+(: verify that fn:current-dateTime() return type is xs:dateTimeStamp  :)
 declare
     %test:assertEquals("true")
 function fd:current-dateTime-type() {
-    fn:current-dateTime() instance of xs:dateTime
+    fn:current-dateTime() instance of xs:dateTimeStamp
 };
 
 declare
     %test:args("2022-05-17T16:24:06.003+02:00", "PT2H")
     %test:assertEquals("true")
-function fd:return-type-test($date as xs:dateTime, $duration as xs:dayTimeDuration) {
-    ($duration + $date) instance of xs:dateTime
+function fd:return-type-test($date as xs:dateTimeStamp, $duration as xs:dayTimeDuration) {
+    ($duration + $date) instance of xs:dateTimeStamp
 };
 
 declare
-    %test:args("not-a-dateTime")
+    %test:args("not-a-dateTimeStamp")
     %test:assertError
-function fd:not-a-dateTime($date as xs:dateTime) {
-    $date instance of xs:dateTime
+function fd:not-a-dateTimeStamp($date as xs:dateTimeStamp) {
+    $date instance of xs:dateTimeStamp
 };
 
 declare
     %test:args("2022-05-17T17:16:00.000")
     %test:assertError
-function fd:not-a-dateTime2($date as xs:dateTime) {
-    $date instance of xs:dateTime
+function fd:not-a-dateTimeStamp2($date as xs:dateTimeStamp) {
+    $date instance of xs:dateTimeStamp
 };
 
 declare
     %test:args("2022-05-17T17:16:00.000Z")
     %test:assertEquals("true")
-function fd:create-dateTime($date as xs:dateTime) {
-    $date instance of xs:dateTime
+function fd:create-dateTimeStamp($date as xs:dateTimeStamp) {
+    $date instance of xs:dateTimeStamp
 };
 
 declare
     %test:args("2022-05-17T17:16:00.000+01:00")
     %test:assertEquals("true")
-function fd:create-dateTime2($date as xs:dateTime) {
-    $date instance of xs:dateTime
+function fd:create-dateTimeStamp2($date as xs:dateTimeStamp) {
+    $date instance of xs:dateTimeStamp
 };