Adjust data types in some of the UNION tests to avoid potentially

platform-dependent results, as per example from Larry Rosenman.

diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index b2b94a7894e12040bf4fb9c6b5c610670902915f..d09d9a81647c837f63d1e44ae2e10a68f97cd76e 100644 (file)
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -74,7 +74,7 @@ SELECT 1 AS two UNION SELECT 2.2;
  2.2
 (2 rows)
 
-SELECT 1 AS one UNION SELECT 1.0;
+SELECT 1 AS one UNION SELECT 1.0::float8;
  one 
 -----
    1
@@ -87,10 +87,10 @@ SELECT 1.1 AS two UNION ALL SELECT 2;
    2
 (2 rows)
 
-SELECT 1.0 AS two UNION ALL SELECT 1;
+SELECT 1.0::float8 AS two UNION ALL SELECT 1;
  two 
 -----
- 1.0
+   1
    1
 (2 rows)
 
@@ -102,7 +102,7 @@ SELECT 1.1 AS three UNION SELECT 2 UNION SELECT 3;
      3
 (3 rows)
 
-SELECT 1.1 AS two UNION SELECT 2 UNION SELECT 2.0;
+SELECT 1.1::float8 AS two UNION SELECT 2 UNION SELECT 2.0::float8;
  two 
 -----
  1.1

diff --git a/src/test/regress/sql/union.sql b/src/test/regress/sql/union.sql
index c69e4c3f15271334cb742b7a4c272f3fb160d435..0f846091cd10c298c41e87b5326e397e6866a3dc 100644 (file)
--- a/src/test/regress/sql/union.sql
+++ b/src/test/regress/sql/union.sql
@@ -26,15 +26,15 @@ SELECT 1.1 AS two UNION SELECT 2;
 
 SELECT 1 AS two UNION SELECT 2.2;
 
-SELECT 1 AS one UNION SELECT 1.0;
+SELECT 1 AS one UNION SELECT 1.0::float8;
 
 SELECT 1.1 AS two UNION ALL SELECT 2;
 
-SELECT 1.0 AS two UNION ALL SELECT 1;
+SELECT 1.0::float8 AS two UNION ALL SELECT 1;
 
 SELECT 1.1 AS three UNION SELECT 2 UNION SELECT 3;
 
-SELECT 1.1 AS two UNION SELECT 2 UNION SELECT 2.0;
+SELECT 1.1::float8 AS two UNION SELECT 2 UNION SELECT 2.0::float8;
 
 SELECT 1.1 AS three UNION SELECT 2 UNION ALL SELECT 2;