For compatibility with other databases, support for (double and float) -0.0 has…

For compatibility with other databases, support for (double and float) -0.0 has been removed. 0.0 is used instead.

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,9 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>For compatibility with other databases, support for (double and float)
+    -0.0 has been removed. 0.0 is used instead.
+</li>
 <li>In version 1.4.186, "order by" was broken in some cases
     due to the change "Make the planner use indexes for sorting when doing a GROUP BY".
     The change was reverted.

h2/src/main/org/h2/value/ValueDouble.java

@@ -92,11 +92,7 @@ public class ValueDouble extends Value {
         } else if (Double.isNaN(value)) {
             return "SQRT(-1)";
         }
-        String s = getString();
-        if (s.equals("-0.0")) {
-            return "-CAST(0 AS DOUBLE)";
-        }
-        return s;
+        return getString();
     }
 
     @Override
@@ -162,11 +158,8 @@ public class ValueDouble extends Value {
         if (d == 1.0) {
             return ONE;
         } else if (d == 0.0) {
-            // unfortunately, -0.0 == 0.0, but we don't want to return
-            // 0.0 in this case
-            if (Double.doubleToLongBits(d) == ZERO_BITS) {
-                return ZERO;
-            }
+            // -0.0 == 0.0, and we want to return 0.0 for both
+            return ZERO;
         } else if (Double.isNaN(d)) {
             return NAN;
         }

h2/src/main/org/h2/value/ValueFloat.java

@@ -92,11 +92,7 @@ public class ValueFloat extends Value {
             // NaN
             return "SQRT(-1)";
         }
-        String s = getString();
-        if (s.equals("-0.0")) {
-            return "-CAST(0 AS REAL)";
-        }
-        return s;
+        return getString();
     }
 
     @Override
@@ -162,11 +158,8 @@ public class ValueFloat extends Value {
         if (d == 1.0F) {
             return ONE;
         } else if (d == 0.0F) {
-            // unfortunately, -0.0 == 0.0, but we don't want to return
-            // 0.0 in this case
-            if (Float.floatToIntBits(d) == ZERO_BITS) {
-                return ZERO;
-            }
+            // -0.0 == 0.0, and we want to return 0.0 for both
+            return ZERO;
         }
         return (ValueFloat) Value.cache(new ValueFloat(d));
     }

h2/src/test/org/h2/test/testScript.sql

@@ -407,14 +407,14 @@ select * from dual where cast('xx' as varchar_ignorecase(1)) = 'X' and cast('x x
 
 explain select -cast(0 as real), -cast(0 as double);
 > PLAN
-> --------------------------------------------------------------------------------------------
-> SELECT -CAST(0 AS REAL), -CAST(0 AS DOUBLE) FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */
+> ----------------------------------------------------------------
+> SELECT 0.0, 0.0 FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */
 > rows: 1
 
 select -cast(0 as double) nz;
 > NZ
-> ----
-> -0.0
+> ---
+> 0.0
 > rows: 1
 
 select () empty;
@@ -7927,7 +7927,7 @@ SELECT ID++0, -X1, -XT, -X_SM, -XB, -XD, -XD2, -XR FROM TEST;
 > ID + 0 - X1  - XT - X_SM - XB - XD  - XD2 - XR
 > ------ ----- ---- ------ ---- ----- ----- ----
 > -1     TRUE  1    1      1    1.00  1.0   1.0
-> 0      TRUE  0    0      0    0.00  -0.0  -0.0
+> 0      TRUE  0    0      0    0.00  0.0   0.0
 > 1      FALSE -1   -1     -1   -1.00 -1.0  -1.0
 > 4      FALSE -4   -4     -4   -4.00 -4.0  -4.0
 > null   null  null null   null null  null  null