Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0fd85d7

Browse files
committed
Remove the datetime keywords ABSTIME and RELTIME, which we'd been treating as
noise words for the last twelve years, for compatibility with Berkeley-eraoutput formatting of the special INVALID values for those datatypes.Considering that the datatypes themselves have been deprecated for awhile,this is taking backwards compatibility a little far. Per gripe from JoshBerkus.
1 parent596efd2 commit0fd85d7

File tree

8 files changed

+14
-47
lines changed

8 files changed

+14
-47
lines changed

‎doc/src/sgml/datetime.sgml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.59 2008/02/16 21:51:04 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/datetime.sgml,v 2.60 2009/03/22 01:12:31 tgl Exp $ -->
22

33
<appendix id="datetime-appendix">
44
<title>Date/Time Support</title>
@@ -308,10 +308,6 @@
308308
</row>
309309
</thead>
310310
<tbody>
311-
<row>
312-
<entry><literal>ABSTIME</literal></entry>
313-
<entry>Ignored</entry>
314-
</row>
315311
<row>
316312
<entry><literal>AM</literal></entry>
317313
<entry>Time is before 12:00</entry>
@@ -339,15 +335,6 @@
339335
</tbody>
340336
</tgroup>
341337
</table>
342-
343-
<para>
344-
The key word <literal>ABSTIME</literal> is ignored for historical
345-
reasons: In very old releases of
346-
<productname>PostgreSQL</productname>, invalid values of type <type>abstime</type>
347-
were emitted as <literal>Invalid Abstime</literal>. This is no
348-
longer the case however and this key word will likely be dropped in
349-
a future release.
350-
</para>
351338
</sect1>
352339

353340
<sect1 id="datetime-config-files">

‎src/backend/utils/adt/datetime.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.202 2009/03/17 18:39:39 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.203 2009/03/22 01:12:31 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -109,7 +109,6 @@ static intsztimezonetktbl = 0;
109109
staticconstdatetkndatetktbl[]= {
110110
/*text, token, lexval */
111111
{EARLY,RESERV,DTK_EARLY},/* "-infinity" reserved for "early time" */
112-
{"abstime",IGNORE_DTF,0},/* for pre-v6.1 "Invalid Abstime" */
113112
{DA_D,ADBC,AD},/* "ad" for years > 0 */
114113
{"allballs",RESERV,DTK_ZULU},/* 00:00:00 */
115114
{"am",AMPM,AM},
@@ -230,7 +229,6 @@ static datetkn deltatktbl[] = {
230229
{"msecs",UNITS,DTK_MILLISEC},
231230
{"qtr",UNITS,DTK_QUARTER},/* "quarter" relative */
232231
{DQUARTER,UNITS,DTK_QUARTER},/* "quarter" relative */
233-
{"reltime",IGNORE_DTF,0},/* pre-v6.1 "Undefined Reltime" */
234232
{"s",UNITS,DTK_SECOND},
235233
{"sec",UNITS,DTK_SECOND},
236234
{DSECOND,UNITS,DTK_SECOND},

‎src/backend/utils/adt/nabstime.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.159 2009/01/01 17:23:49 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.160 2009/03/22 01:12:32 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -30,12 +30,6 @@
3030
#defineMIN_DAYNUM (-24856)/* December 13, 1901 */
3131
#defineMAX_DAYNUM 24854/* January 18, 2038 */
3232

33-
#defineINVALID_RELTIME_STR"Undefined RelTime"
34-
#defineINVALID_RELTIME_STR_LEN (sizeof(INVALID_RELTIME_STR)-1)
35-
#defineRELTIME_LABEL'@'
36-
#defineRELTIME_PAST"ago"
37-
#defineDIRMAXLEN(sizeof(RELTIME_PAST)-1)
38-
3933
/*
4034
* Unix epoch is Jan 1 00:00:00 1970.
4135
* Postgres knows about times sixty-eight years on either side of that

‎src/interfaces/ecpg/pgtypeslib/dt_common.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.47 2009/02/05 08:28:47 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.48 2009/03/22 01:12:32 tgl Exp $ */
22

33
#include"postgres_fe.h"
44

@@ -26,7 +26,6 @@ typedef long AbsoluteTime;
2626
staticdatetkndatetktbl[]= {
2727
/*text, token, lexval */
2828
{EARLY,RESERV,DTK_EARLY},/* "-infinity" reserved for "early time" */
29-
{"abstime",IGNORE_DTF,0},/* for pre-v6.1 "Invalid Abstime" */
3029
{"acsst",DTZ,POS(42)},/* Cent. Australia */
3130
{"acst",DTZ,NEG(16)},/* Atlantic/Porto Acre */
3231
{"act",TZ,NEG(20)},/* Atlantic/Porto Acre */
@@ -471,7 +470,6 @@ static datetkn deltatktbl[] = {
471470
{"msecs",UNITS,DTK_MILLISEC},
472471
{"qtr",UNITS,DTK_QUARTER},/* "quarter" relative */
473472
{DQUARTER,UNITS,DTK_QUARTER},/* "quarter" relative */
474-
{"reltime",IGNORE_DTF,0},/* pre-v6.1 "Undefined Reltime" */
475473
{"s",UNITS,DTK_SECOND},
476474
{"sec",UNITS,DTK_SECOND},
477475
{DSECOND,UNITS,DTK_SECOND},

‎src/test/regress/expected/timestamp.out

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,16 @@ INSERT INTO TIMESTAMP_TBL VALUES ('invalid');
8484
ERROR: date/time value "invalid" is no longer supported
8585
LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('invalid');
8686
^
87+
INSERT INTO TIMESTAMP_TBL VALUES ('undefined');
88+
ERROR: date/time value "undefined" is no longer supported
89+
LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('undefined');
90+
^
8791
INSERT INTO TIMESTAMP_TBL VALUES ('current');
8892
ERROR: date/time value "current" is no longer supported
8993
LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('current');
9094
^
9195
-- Postgres v6.0 standard output format
9296
INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
93-
INSERT INTO TIMESTAMP_TBL VALUES ('Invalid Abstime');
94-
ERROR: date/time value "Invalid Abstime" is no longer supported
95-
LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Invalid Abstime');
96-
^
97-
INSERT INTO TIMESTAMP_TBL VALUES ('Undefined Abstime');
98-
ERROR: date/time value "Undefined Abstime" is no longer supported
99-
LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Undefined Abstime');
100-
^
10197
-- Variations on Postgres v6.1 standard output format
10298
INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');
10399
INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01.999999 1997 PST');

‎src/test/regress/expected/timestamptz.out

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,16 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('invalid');
8383
ERROR: date/time value "invalid" is no longer supported
8484
LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('invalid');
8585
^
86+
INSERT INTO TIMESTAMPTZ_TBL VALUES ('undefined');
87+
ERROR: date/time value "undefined" is no longer supported
88+
LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('undefined');
89+
^
8690
INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
8791
ERROR: date/time value "current" is no longer supported
8892
LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
8993
^
9094
-- Postgres v6.0 standard output format
9195
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
92-
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Invalid Abstime');
93-
ERROR: date/time value "Invalid Abstime" is no longer supported
94-
LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('Invalid Abstime');
95-
^
96-
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Undefined Abstime');
97-
ERROR: date/time value "Undefined Abstime" is no longer supported
98-
LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('Undefined Abstime');
99-
^
10096
-- Variations on Postgres v6.1 standard output format
10197
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');
10298
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01.999999 1997 PST');

‎src/test/regress/sql/timestamp.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@ INSERT INTO TIMESTAMP_TBL VALUES ('infinity');
5252
INSERT INTO TIMESTAMP_TBLVALUES ('epoch');
5353
-- Obsolete special values
5454
INSERT INTO TIMESTAMP_TBLVALUES ('invalid');
55+
INSERT INTO TIMESTAMP_TBLVALUES ('undefined');
5556
INSERT INTO TIMESTAMP_TBLVALUES ('current');
5657

5758
-- Postgres v6.0 standard output format
5859
INSERT INTO TIMESTAMP_TBLVALUES ('Mon Feb 10 17:32:01 1997 PST');
59-
INSERT INTO TIMESTAMP_TBLVALUES ('Invalid Abstime');
60-
INSERT INTO TIMESTAMP_TBLVALUES ('Undefined Abstime');
6160

6261
-- Variations on Postgres v6.1 standard output format
6362
INSERT INTO TIMESTAMP_TBLVALUES ('Mon Feb 10 17:32:01.000001 1997 PST');

‎src/test/regress/sql/timestamptz.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('infinity');
5151
INSERT INTO TIMESTAMPTZ_TBLVALUES ('epoch');
5252
-- Obsolete special values
5353
INSERT INTO TIMESTAMPTZ_TBLVALUES ('invalid');
54+
INSERT INTO TIMESTAMPTZ_TBLVALUES ('undefined');
5455
INSERT INTO TIMESTAMPTZ_TBLVALUES ('current');
5556

5657
-- Postgres v6.0 standard output format
5758
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Mon Feb 10 17:32:01 1997 PST');
58-
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Invalid Abstime');
59-
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Undefined Abstime');
6059

6160
-- Variations on Postgres v6.1 standard output format
6261
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Mon Feb 10 17:32:01.000001 1997 PST');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp