Output changed for new ORDER BY to cope with new sorting routines.

This commit is contained in:
Thomas G. Lockhart 1997-09-20 16:37:02 +00:00
parent 7971fb0d79
commit 1556e62573
6 changed files with 66 additions and 66 deletions

View File

@ -123,9 +123,9 @@ QUERY: INSERT INTO DATETIME_TBL VALUES ('Jan 01 17:32:01 2000');
QUERY: INSERT INTO DATETIME_TBL VALUES ('Dec 31 17:32:01 2000');
QUERY: INSERT INTO DATETIME_TBL VALUES ('Jan 01 17:32:01 2001');
QUERY: INSERT INTO DATETIME_TBL VALUES ('Feb 16 17:32:01 -0097');
WARN:Bad datetime external representation Feb 16 17:32:01 -0097
WARN:Bad datetime external representation 'Feb 16 17:32:01 -0097'
QUERY: INSERT INTO DATETIME_TBL VALUES ('Feb 16 17:32:01 5097 BC');
WARN:Datetime out of range Feb 16 17:32:01 5097 BC
WARN:Datetime out of range 'Feb 16 17:32:01 5097 BC'
QUERY: SELECT '' AS sixtythree, d1 FROM DATETIME_TBL;
sixtythree|d1
----------+-------------------------------

View File

@ -466,7 +466,7 @@ two|circle
QUERY: SELECT '' AS twentyfour, c1.f1 AS circle, p1.f1 AS point, (p1.f1 <-> c1.f1) AS distance
FROM CIRCLE_TBL c1, POINT_TBL p1
WHERE (p1.f1 <-> c1.f1) > 0
ORDER BY distance, circle;
ORDER BY distance, circle, point using <<;
twentyfour|circle |point | distance
----------+--------------+----------+-----------------
|<(100,0),100> |(5.1,34.5)|0.976531926977964
@ -474,8 +474,8 @@ twentyfour|circle |point | distance
|<(0,0),3> |(-3,4) | 2
|<(100,0),100> |(-3,4) | 3.07764064044151
|<(100,0),100> |(-5,-12) | 5.68348972285122
|<(1,3),5> |(10,10) | 6.40175425099138
|<(1,3),5> |(-10,0) | 6.40175425099138
|<(1,3),5> |(10,10) | 6.40175425099138
|<(0,0),3> |(-10,0) | 7
|<(1,2),3> |(-10,0) | 8.18033988749895
|<(1,2),3> |(10,10) | 9.0415945787923

View File

@ -22,7 +22,7 @@ ten|datetime
QUERY: SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 + t.f1 AS plus
FROM TEMP_DATETIME d, TIMESPAN_TBL t
ORDER BY plus;
ORDER BY plus, datetime, timespan;
hundred|datetime |timespan |plus
-------+----------------------------+-----------------------------+----------------------------
|epoch |@ 14 secs ago |Wed Dec 31 15:59:46 1969 PST
@ -106,8 +106,8 @@ hundred|datetime |timespan |plus
|Sun Dec 31 17:32:01 2000 PST|@ 5 mons 12 hours |Fri Jun 01 06:32:01 2001 PDT
|Mon Jan 01 17:32:01 2001 PST|@ 5 mons |Fri Jun 01 18:32:01 2001 PDT
|Mon Jan 01 17:32:01 2001 PST|@ 5 mons 12 hours |Sat Jun 02 06:32:01 2001 PDT
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
|Wed Feb 28 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
|Fri Mar 01 17:32:01 1996 PST|@ 6 years |Fri Mar 01 17:32:01 2002 PST
|Mon Dec 30 17:32:01 1996 PST|@ 6 years |Mon Dec 30 17:32:01 2002 PST
|Tue Dec 31 17:32:01 1996 PST|@ 6 years |Tue Dec 31 17:32:01 2002 PST
@ -116,8 +116,8 @@ hundred|datetime |timespan |plus
|Sat Jan 01 17:32:01 2000 PST|@ 6 years |Sun Jan 01 17:32:01 2006 PST
|Sun Dec 31 17:32:01 2000 PST|@ 6 years |Sun Dec 31 17:32:01 2006 PST
|Mon Jan 01 17:32:01 2001 PST|@ 6 years |Mon Jan 01 17:32:01 2007 PST
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
|Wed Feb 28 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
|Fri Mar 01 17:32:01 1996 PST|@ 34 years |Fri Mar 01 17:32:01 2030 PST
|Mon Dec 30 17:32:01 1996 PST|@ 34 years |Mon Dec 30 17:32:01 2030 PST
|Tue Dec 31 17:32:01 1996 PST|@ 34 years |Tue Dec 31 17:32:01 2030 PST
@ -130,12 +130,12 @@ hundred|datetime |timespan |plus
QUERY: SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 - t.f1 AS minus
FROM TEMP_DATETIME d, TIMESPAN_TBL t
WHERE isfinite(d.f1)
ORDER BY minus;
ORDER BY minus, datetime, timespan;
hundred|datetime |timespan |minus
-------+----------------------------+-----------------------------+----------------------------
|epoch |@ 34 years |Tue Dec 31 16:00:00 1935 PST
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
|Wed Feb 28 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
|Fri Mar 01 17:32:01 1996 PST|@ 34 years |Thu Mar 01 17:32:01 1962 PST
|Mon Dec 30 17:32:01 1996 PST|@ 34 years |Sun Dec 30 17:32:01 1962 PST
|Tue Dec 31 17:32:01 1996 PST|@ 34 years |Mon Dec 31 17:32:01 1962 PST
@ -152,8 +152,8 @@ hundred|datetime |timespan |minus
|epoch |@ 5 hours |Wed Dec 31 11:00:00 1969 PST
|epoch |@ 1 min |Wed Dec 31 15:59:00 1969 PST
|epoch |@ 14 secs ago |Wed Dec 31 16:00:14 1969 PST
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
|Wed Feb 28 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
|Fri Mar 01 17:32:01 1996 PST|@ 6 years |Thu Mar 01 17:32:01 1990 PST
|Mon Dec 30 17:32:01 1996 PST|@ 6 years |Sun Dec 30 17:32:01 1990 PST
|Tue Dec 31 17:32:01 1996 PST|@ 6 years |Mon Dec 31 17:32:01 1990 PST
@ -189,8 +189,8 @@ hundred|datetime |timespan |minus
|Mon Dec 30 17:32:01 1996 PST|@ 5 mons |Tue Jul 30 18:32:01 1996 PDT
|Tue Dec 31 17:32:01 1996 PST|@ 5 mons 12 hours |Wed Jul 31 06:32:01 1996 PDT
|Tue Dec 31 17:32:01 1996 PST|@ 5 mons |Wed Jul 31 18:32:01 1996 PDT
|Tue Dec 31 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
|Mon Dec 30 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
|Tue Dec 31 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
|Mon Dec 30 17:32:01 1996 PST|@ 10 days |Fri Dec 20 17:32:01 1996 PST
|Tue Dec 31 17:32:01 1996 PST|@ 10 days |Sat Dec 21 17:32:01 1996 PST
|Mon Dec 30 17:32:01 1996 PST|@ 1 day 2 hours 3 mins 4 secs|Sun Dec 29 15:28:57 1996 PST

View File

@ -98,31 +98,31 @@ six|f1 | dist
QUERY: SET geqo TO 'off';
QUERY: SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
FROM POINT_TBL p1, POINT_TBL p2
ORDER BY dist;
ORDER BY dist, point1 using <<, point2 using <<;
thirtysix|point1 |point2 | dist
---------+----------+----------+----------------
|(10,10) |(10,10) | 0
|(-5,-12) |(-5,-12) | 0
|(5.1,34.5)|(5.1,34.5)| 0
|(-3,4) |(-3,4) | 0
|(-10,0) |(-10,0) | 0
|(-5,-12) |(-5,-12) | 0
|(-3,4) |(-3,4) | 0
|(0,0) |(0,0) | 0
|(0,0) |(-3,4) | 5
|(5.1,34.5)|(5.1,34.5)| 0
|(10,10) |(10,10) | 0
|(-3,4) |(0,0) | 5
|(0,0) |(-3,4) | 5
|(-10,0) |(-3,4) |8.06225774829855
|(-3,4) |(-10,0) |8.06225774829855
|(-10,0) |(0,0) | 10
|(0,0) |(-10,0) | 10
|(-5,-12) |(0,0) | 13
|(-10,0) |(-5,-12) | 13
|(0,0) |(-5,-12) | 13
|(-5,-12) |(-10,0) | 13
|(10,10) |(0,0) | 14.142135623731
|(-5,-12) |(0,0) | 13
|(0,0) |(-5,-12) | 13
|(0,0) |(10,10) | 14.142135623731
|(10,10) |(-3,4) |14.3178210632764
|(10,10) |(0,0) | 14.142135623731
|(-3,4) |(10,10) |14.3178210632764
|(-3,4) |(-5,-12) |16.1245154965971
|(10,10) |(-3,4) |14.3178210632764
|(-5,-12) |(-3,4) |16.1245154965971
|(-3,4) |(-5,-12) |16.1245154965971
|(-10,0) |(10,10) |22.3606797749979
|(10,10) |(-10,0) |22.3606797749979
|(5.1,34.5)|(10,10) |24.9851956166046
@ -131,8 +131,8 @@ thirtysix|point1 |point2 | dist
|(10,10) |(-5,-12) |26.6270539113887
|(-3,4) |(5.1,34.5)|31.5572495632937
|(5.1,34.5)|(-3,4) |31.5572495632937
|(5.1,34.5)|(0,0) |34.8749193547455
|(0,0) |(5.1,34.5)|34.8749193547455
|(5.1,34.5)|(0,0) |34.8749193547455
|(-10,0) |(5.1,34.5)|37.6597928831267
|(5.1,34.5)|(-10,0) |37.6597928831267
|(-5,-12) |(5.1,34.5)|47.5842410888311

View File

@ -238,66 +238,66 @@ cim | 30
linda | 19
(58 rows)
QUERY: SELECT p.name, p.age FROM person* p ORDER BY age using >;
QUERY: SELECT p.name, p.age FROM person* p ORDER BY age using >, name;
name |age
-------+---
zena | 98
esther | 98
louise | 98
trisha | 88
koko | 88
sarah | 88
trudy | 88
martie | 88
zena | 98
bertha | 88
vera | 78
sharon | 78
koko | 88
martie | 88
sarah | 88
trisha | 88
trudy | 88
carmen | 78
chris | 78
sharon | 78
susan | 78
vera | 78
wendy | 78
leah | 68
velma | 68
paula | 68
julie | 68
leah | 68
paula | 68
velma | 68
larry | 60
juanita| 58
jane | 58
zola | 58
carina | 58
jane | 58
juanita| 58
zola | 58
sue | 50
rean | 48
karen | 48
pamela | 48
rean | 48
mike | 40
belinda| 38
teresa | 38
liza | 38
jenifer| 38
sumi | 38
liza | 38
sandy | 38
sumi | 38
teresa | 38
sally | 34
cim | 30
alex | 30
cim | 30
sam | 30
nan | 28
fred | 28
jean | 28
melissa| 28
sharon | 25
nan | 28
lita | 25
sharon | 25
denise | 24
jeff | 23
joe | 20
bill | 20
sandra | 19
joe | 20
linda | 19
gina | 18
pat | 18
sandra | 19
diane | 18
joan | 18
edna | 18
mary | 8
gina | 18
joan | 18
pat | 18
fanny | 8
mary | 8
(58 rows)

View File

@ -15,14 +15,14 @@ WARN:Bad abstime external representation 'bad time specifications'
QUERY: INSERT INTO TINTERVAL_TBL (f1)
VALUES ('["" "infinity"]');
WARN:Bad abstime external representation ''
QUERY: SELECT '' AS seven, TINTERVAL_TBL.*;
seven|f1
-----+---------------------------------------------------------------
|["-infinity" "infinity"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["Thu Feb 15 12:15:03 1990 PST" "current"]
QUERY: SELECT '' AS five, TINTERVAL_TBL.*;
five|f1
----+---------------------------------------------------------------
|["-infinity" "infinity"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["Thu Feb 15 12:15:03 1990 PST" "current"]
(5 rows)
QUERY: SELECT '' AS one, t.*
@ -98,10 +98,10 @@ QUERY: SELECT '' AS five, t1.f1, t2.f1
five|f1 |f1
----+---------------------------------------------------------------+---------------------------------------------------------------
|["-infinity" "infinity"] |["-infinity" "infinity"]
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
(5 rows)
QUERY: SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2
@ -115,15 +115,15 @@ fourteen|interval1 |interva
|["-infinity" "infinity"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["-infinity" "infinity"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["-infinity" "infinity"]
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["-infinity" "infinity"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["-infinity" "infinity"]
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["-infinity" "infinity"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
(14 rows)
QUERY: SELECT '' AS five, t1.f1
@ -133,9 +133,9 @@ QUERY: SELECT '' AS five, t1.f1
ORDER BY t1.f1;
five|f1
----+---------------------------------------------------------------
|["Thu Feb 15 12:15:03 1990 PST" "current"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
|["Thu Feb 15 12:15:03 1990 PST" "current"]
(3 rows)
QUERY: SELECT '' AS three, t1.f1