Merge pull request #3814 from katzyn/decfloat

Fix regression in comparisons with infinities and NaNs
h2database · Jun 7, 2023 · 09ab495 · 09ab495
2 parents 6992cb9 + 78253ee
commit 09ab495
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/h2/src/main/org/h2/value/Value.java b/h2/src/main/org/h2/value/Value.java
@@ -2657,13 +2657,16 @@ private static int compareNumeric(Value l, Value r, int leftType, int rightType,
                 return Integer.compare(l.getInt(), r.getInt());
             case BIGINT:
                 return Long.compare(l.getLong(), r.getLong());
+            case NUMERIC:
+                return l.getBigDecimal().compareTo(r.getBigDecimal());
             case REAL:
                 return Float.compare(l.getFloat(), r.getFloat());
             case DOUBLE:
                 return Double.compare(l.getDouble(), r.getDouble());
             }
         }
-        return l.getBigDecimal().compareTo(r.getBigDecimal());
+        return l.convertToDecfloat(null, CONVERT_TO).compareTypeSafe( //
+                r.convertToDecfloat(null, CONVERT_TO), null, null);
     }
 
     /**

diff --git a/h2/src/test/org/h2/test/scripts/datatypes/decfloat.sql b/h2/src/test/org/h2/test/scripts/datatypes/decfloat.sql
@@ -284,3 +284,9 @@ DROP TABLE TEST;
 
 VALUES '1E100' > 0;
 >> TRUE
+
+SELECT 'NaN' = CAST('NaN' AS DECFLOAT);
+>> TRUE
+
+SELECT CAST('NaN' AS DOUBLE ) = CAST('NaN' AS DECFLOAT);
+>> TRUE
diff --git a/h2/src/test/org/h2/test/scripts/datatypes/double_precision.sql b/h2/src/test/org/h2/test/scripts/datatypes/double_precision.sql
@@ -234,3 +234,6 @@ DROP TABLE TEST;
 
 SELECT CAST(PI() AS DOUBLE PRECISION) / 1e0;
 >> 3.141592653589793
+
+SELECT 'NaN' = CAST('NaN' AS DOUBLE);
+>> TRUE