summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael P2011-05-25 07:08:33 +0000
committerMichael P2011-05-25 07:08:33 +0000
commit3b98a30005200738184510c9cc44a8d66c695815 (patch)
tree146df39bac527f381bb4b843137553da2f9fd109
parent3c71bd016e200f1f44e98762eeca0184b1385294 (diff)
Fix for regression tests float4, float8, geometry, point
ORDER BY extensions were missing after merge with postgres master branch
-rw-r--r--src/test/regress/expected/float4.out2
-rw-r--r--src/test/regress/expected/float4_1.out2
-rw-r--r--src/test/regress/expected/float8.out2
-rw-r--r--src/test/regress/expected/geometry.out8
-rw-r--r--src/test/regress/expected/point.out2
-rw-r--r--src/test/regress/sql/point.sql2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out
index db2638817c..a4111ecdcb 100644
--- a/src/test/regress/expected/float4.out
+++ b/src/test/regress/expected/float4.out
@@ -125,7 +125,7 @@ SELECT 'nan'::numeric::float4;
NaN
(1 row)
-SELECT '' AS five, * FROM FLOAT4_TBL;
+SELECT '' AS five, * FROM FLOAT4_TBL ORDER BY f1;
five | f1
------+-------------
| -34.84
diff --git a/src/test/regress/expected/float4_1.out b/src/test/regress/expected/float4_1.out
index 432d159ef7..09ec3184d0 100644
--- a/src/test/regress/expected/float4_1.out
+++ b/src/test/regress/expected/float4_1.out
@@ -125,7 +125,7 @@ SELECT 'nan'::numeric::float4;
NaN
(1 row)
-SELECT '' AS five, * FROM FLOAT4_TBL;
+SELECT '' AS five, * FROM FLOAT4_TBL ORDER BY f1;
five | f1
------+-------------
| 1004.3
diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out
index 3dbfaa33e3..1f79f66724 100644
--- a/src/test/regress/expected/float8.out
+++ b/src/test/regress/expected/float8.out
@@ -125,7 +125,7 @@ SELECT 'nan'::numeric::float8;
NaN
(1 row)
-SELECT '' AS five, * FROM FLOAT8_TBL;
+SELECT '' AS five, * FROM FLOAT8_TBL ORDER BY f1;
five | f1
------+----------------------
| -34.84
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index c19b619e1c..966c73921b 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -260,24 +260,24 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
twenty | rotation
--------+----------------------------------------------------------------------
| (0,-0),(-0.2,-0.2)
+ | (-0,0.0828402366864),(-0.201183431953,0)
| (0.08,-0),(0,-0.56)
| (0.0651176557644,0),(0,-0.0483449262493)
- | (-0,0.0828402366864),(-0.201183431953,0)
| (0.2,0),(0,0)
| (-0.1,-0.1),(-0.3,-0.3)
+ | (-0.100591715976,0.12426035503),(-0.301775147929,0.0414201183432)
| (0.12,-0.28),(0.04,-0.84)
| (0.0976764836466,-0.0241724631247),(0.0325588278822,-0.072517389374)
- | (-0.100591715976,0.12426035503),(-0.301775147929,0.0414201183432)
| (0.3,0),(0.1,0)
| (-0.25,-0.25),(-0.25,-0.35)
+ | (-0.251479289941,0.103550295858),(-0.322485207101,0.0739644970414)
| (0.26,-0.7),(0.1,-0.82)
| (0.109762715209,-0.0562379754329),(0.0813970697055,-0.0604311578117)
- | (-0.251479289941,0.103550295858),(-0.322485207101,0.0739644970414)
| (0.3,0.05),(0.25,0)
| (-0.3,-0.3),(-0.3,-0.3)
+ | (-0.301775147929,0.12426035503),(-0.301775147929,0.12426035503)
| (0.12,-0.84),(0.12,-0.84)
| (0.0976764836466,-0.072517389374),(0.0976764836466,-0.072517389374)
- | (-0.301775147929,0.12426035503),(-0.301775147929,0.12426035503)
| (0.3,0),(0.3,0)
(20 rows)
diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out
index ddc073567c..84da956a30 100644
--- a/src/test/regress/expected/point.out
+++ b/src/test/regress/expected/point.out
@@ -91,7 +91,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p
(3 rows)
SELECT '' AS three, p.* FROM POINT_TBL p
- WHERE not p.f1 <@ box '(0,0,100,100)';
+ WHERE not p.f1 <@ box '(0,0,100,100)' ORDER BY p.f1[0], p.f1[1];
three | f1
-------+----------
| (-10,0)
diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index 50d55c870f..faa6b9e935 100644
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -48,7 +48,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p
WHERE p.f1 <@ box '(0,0,100,100)' ORDER BY p.f1[0], p.f1[1];
SELECT '' AS three, p.* FROM POINT_TBL p
- WHERE box '(0,0,100,100)' @> p.f1 ORDER BY p.f1[0], p.f1[1];
+ WHERE box '(0,0,100,100)' @> p.f1;
SELECT '' AS three, p.* FROM POINT_TBL p
WHERE not p.f1 <@ box '(0,0,100,100)';