[MIN] XQuery, fn:min, fn:max. qtspecs#2216

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/fn/FnMin.java

@@ -52,14 +52,11 @@ final Item minmax(final boolean min, final QueryContext qc) throws QueryExceptio
     Item item = iter.next();
     if(item == null) return Empty.VALUE;
 
-    // ensure that item is sortable
     final Type type = item.type;
-    if(!type.isSortable()) throw COMPARE_X_X.get(info, type, item);
-
     final boolean string = item instanceof AStr;
-    final boolean numeric = !string && !(
-        type == BOOLEAN || item instanceof ADate || item instanceof Dur || item instanceof Bin);
-    final boolean dateTime = type.instanceOf(DATE_TIME);
+    final boolean dateTime = item instanceof Dtm, duration = item instanceof Dur;
+    final boolean numeric = !(string || dateTime || duration || type == BOOLEAN || type == QNAME ||
+        item instanceof ADate || item instanceof Dur || item instanceof Bin);
     if(numeric) {
       if(type.isUntyped()) item = DOUBLE.cast(item, qc, info);
       if(item == Dbl.NAN || item == Flt.NAN) return item;
@@ -70,8 +67,8 @@ final Item minmax(final boolean min, final QueryContext qc) throws QueryExceptio
         if(type2.isUntyped()) it = DOUBLE.cast(it, qc, info);
         if(it == Dbl.NAN || it == Flt.NAN) return it;
       }
-      if(!(numeric ? it instanceof ANum : string ? it instanceof AStr : dateTime ?
-        type2.instanceOf(DATE_TIME) : type == type2)) {
+      if(!(numeric ? it instanceof ANum : string ? it instanceof AStr :
+         dateTime ? it instanceof Dtm : duration ? it instanceof Dur : type == type2)) {
         throw ARGTYPE_X_X_X.get(info, type, type2, it);
       }
       if(min ^ item.compare(it, collation, true, info) < 0) item = it;

basex-core/src/main/java/org/basex/query/value/item/ADate.java

@@ -405,11 +405,6 @@ public final int hashCode() {
     return toSeconds().intValue();
   }
 
-  @Override
-  public boolean comparable(final Item item) {
-    return item instanceof ADate;
-  }
-
   @Override
   public final int compare(final Item item, final Collation coll, final boolean transitive,
       final InputInfo ii) throws QueryException {

basex-core/src/main/java/org/basex/query/value/item/Dtm.java

@@ -112,4 +112,9 @@ public static Dtm get(final long ms) {
       throw Util.notExpected(ex);
     }
   }
+
+  @Override
+  public boolean comparable(final Item item) {
+    return item instanceof Dtm;
+  }
 }

basex-core/src/main/java/org/basex/query/value/type/AtomType.java

@@ -570,7 +570,7 @@ public Itr read(final DataInput in, final QueryContext qc) throws IOException {
   },
 
   /** Duration type. */
-  DURATION("duration", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.DUR) {
+  DURATION("duration", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.DUR) {
     @Override
     public Dur cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -713,7 +713,7 @@ public Tim read(final DataInput in, final QueryContext qc) throws IOException, Q
   },
 
   /** Year month type. */
-  G_YEAR_MONTH("gYearMonth", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.YMO) {
+  G_YEAR_MONTH("gYearMonth", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.YMO) {
     @Override
     public GDt cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -733,7 +733,7 @@ public GDt read(final DataInput in, final QueryContext qc) throws IOException, Q
   },
 
   /** Year type. */
-  G_YEAR("gYear", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.YEA) {
+  G_YEAR("gYear", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.YEA) {
     @Override
     public GDt cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -753,7 +753,7 @@ public GDt read(final DataInput in, final QueryContext qc) throws IOException, Q
   },
 
   /** Month day type. */
-  G_MONTH_DAY("gMonthDay", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.MDA) {
+  G_MONTH_DAY("gMonthDay", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.MDA) {
     @Override
     public GDt cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -773,7 +773,7 @@ public GDt read(final DataInput in, final QueryContext qc) throws IOException, Q
   },
 
   /** Day type. */
-  G_DAY("gDay", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.DAY) {
+  G_DAY("gDay", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.DAY) {
     @Override
     public GDt cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -793,7 +793,7 @@ public GDt read(final DataInput in, final QueryContext qc) throws IOException, Q
   },
 
   /** Month type. */
-  G_MONTH("gMonth", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.MON) {
+  G_MONTH("gMonth", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.MON) {
     @Override
     public GDt cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {
@@ -897,7 +897,7 @@ public Uri read(final DataInput in, final QueryContext qc) throws IOException {
   },
 
   /** QName Type. */
-  QNAME("QName", ANY_ATOMIC_TYPE, XS_URI, false, false, false, false, Type.ID.QNM) {
+  QNAME("QName", ANY_ATOMIC_TYPE, XS_URI, false, false, false, true, Type.ID.QNM) {
     @Override
     public QNm cast(final Item item, final QueryContext qc, final InputInfo info)
         throws QueryException {

basex-core/src/test/java/org/basex/query/func/FnModuleTest.java

@@ -2075,8 +2075,9 @@ public final class FnModuleTest extends SandboxTest {
     check(func.args(wrap(1)), 1, exists(func));
     check(func.args(" (0 to 99999999999) ! (1 to 10000000)"), 1, root(Itr.class));
 
+    query(func.args(" #a"), "#a");
+
     // errors
-    error(func.args(" #a"), COMPARE_X_X);
     error(func.args(" ('b', 'c', 'a', 1)"), ARGTYPE_X_X_X);
     error(func.args(" (2, 3, 1, 'a')"), ARGTYPE_X_X_X);
     error(func.args(" (false(), true(), false(), 1)"), ARGTYPE_X_X_X);