database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Disallow infinite endpoints in generate_series() for timestamps.

Browse Source 
Such cases will lead to infinite loops, so they're of no practical
value.  The numeric variant of generate_series() already threw error
for this, so borrow its message wording.

Per report from Richard Wesley.  Back-patch to all supported branches.

Discussion: https://postgr.es/m/91B44E7B-68D5-448F-95C8-B4B3B0F5DEAF@duckdblabs.com
This commit is contained in:
Tom Lane
2022-04-20 18:08:15 -04:00
parent 9130f8cbb9
commit e7adbd282d
5 changed files with 156 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/utils/adt/timestamp.c
View File

@@ -5305,6 +5305,20 @@ generate_series_timestamp(PG_FUNCTION_ARGS)
MemoryContext oldcontext; MemoryContext oldcontext;
Interval interval_zero; Interval interval_zero;
/* Reject infinities in start and stop values */
if (TIMESTAMP_IS_NOBEGIN(start) ||
TIMESTAMP_IS_NOEND(start))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("start value cannot be infinity")));
if (TIMESTAMP_IS_NOBEGIN(finish) ||
TIMESTAMP_IS_NOEND(finish))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("stop value cannot be infinity")));
/* Interval doesn't (currently) have infinity, so nothing to check */
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();
@@ -5386,6 +5400,20 @@ generate_series_timestamptz(PG_FUNCTION_ARGS)
MemoryContext oldcontext; MemoryContext oldcontext;
Interval interval_zero; Interval interval_zero;
/* Reject infinities in start and stop values */
if (TIMESTAMP_IS_NOBEGIN(start) ||
TIMESTAMP_IS_NOEND(start))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("start value cannot be infinity")));
if (TIMESTAMP_IS_NOBEGIN(finish) ||
TIMESTAMP_IS_NOEND(finish))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("stop value cannot be infinity")));
/* Interval doesn't (currently) have infinity, so nothing to check */
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();

49
src/test/regress/expected/timestamp.out
View File

@@ -1744,3 +1744,52 @@ SELECT make_timestamp(2014,12,28,6,30,45.887);
Sun Dec 28 06:30:45.887 2014 Sun Dec 28 06:30:45.887 2014
(1 row) (1 row)
-- generate_series for timestamp
select * from generate_series('2020-01-01 00:00'::timestamp,
'2020-01-02 03:00'::timestamp,
'1 hour'::interval);
generate_series
--------------------------
Wed Jan 01 00:00:00 2020
Wed Jan 01 01:00:00 2020
Wed Jan 01 02:00:00 2020
Wed Jan 01 03:00:00 2020
Wed Jan 01 04:00:00 2020
Wed Jan 01 05:00:00 2020
Wed Jan 01 06:00:00 2020
Wed Jan 01 07:00:00 2020
Wed Jan 01 08:00:00 2020
Wed Jan 01 09:00:00 2020
Wed Jan 01 10:00:00 2020
Wed Jan 01 11:00:00 2020
Wed Jan 01 12:00:00 2020
Wed Jan 01 13:00:00 2020
Wed Jan 01 14:00:00 2020
Wed Jan 01 15:00:00 2020
Wed Jan 01 16:00:00 2020
Wed Jan 01 17:00:00 2020
Wed Jan 01 18:00:00 2020
Wed Jan 01 19:00:00 2020
Wed Jan 01 20:00:00 2020
Wed Jan 01 21:00:00 2020
Wed Jan 01 22:00:00 2020
Wed Jan 01 23:00:00 2020
Thu Jan 02 00:00:00 2020
Thu Jan 02 01:00:00 2020
Thu Jan 02 02:00:00 2020
Thu Jan 02 03:00:00 2020
(28 rows)
-- errors
select * from generate_series('-infinity'::timestamp,
'2020-01-02 03:00'::timestamp,
'1 hour'::interval);
ERROR: start value cannot be infinity
select * from generate_series('2020-01-01 00:00'::timestamp,
'infinity'::timestamp,
'1 hour'::interval);
ERROR: stop value cannot be infinity
select * from generate_series('2020-01-01 00:00'::timestamp,
'2020-01-02 03:00'::timestamp,
'0 hour'::interval);
ERROR: step size cannot equal zero

49
src/test/regress/expected/timestamptz.out
View File

@@ -2086,6 +2086,55 @@ SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
(1 row) (1 row)
RESET TimeZone; RESET TimeZone;
-- generate_series for timestamptz
select * from generate_series('2020-01-01 00:00'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'1 hour'::interval);
generate_series
------------------------------
Wed Jan 01 00:00:00 2020 PST
Wed Jan 01 01:00:00 2020 PST
Wed Jan 01 02:00:00 2020 PST
Wed Jan 01 03:00:00 2020 PST
Wed Jan 01 04:00:00 2020 PST
Wed Jan 01 05:00:00 2020 PST
Wed Jan 01 06:00:00 2020 PST
Wed Jan 01 07:00:00 2020 PST
Wed Jan 01 08:00:00 2020 PST
Wed Jan 01 09:00:00 2020 PST
Wed Jan 01 10:00:00 2020 PST
Wed Jan 01 11:00:00 2020 PST
Wed Jan 01 12:00:00 2020 PST
Wed Jan 01 13:00:00 2020 PST
Wed Jan 01 14:00:00 2020 PST
Wed Jan 01 15:00:00 2020 PST
Wed Jan 01 16:00:00 2020 PST
Wed Jan 01 17:00:00 2020 PST
Wed Jan 01 18:00:00 2020 PST
Wed Jan 01 19:00:00 2020 PST
Wed Jan 01 20:00:00 2020 PST
Wed Jan 01 21:00:00 2020 PST
Wed Jan 01 22:00:00 2020 PST
Wed Jan 01 23:00:00 2020 PST
Thu Jan 02 00:00:00 2020 PST
Thu Jan 02 01:00:00 2020 PST
Thu Jan 02 02:00:00 2020 PST
Thu Jan 02 03:00:00 2020 PST
(28 rows)
-- errors
select * from generate_series('-infinity'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'1 hour'::interval);
ERROR: start value cannot be infinity
select * from generate_series('2020-01-01 00:00'::timestamptz,
'infinity'::timestamptz,
'1 hour'::interval);
ERROR: stop value cannot be infinity
select * from generate_series('2020-01-01 00:00'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'0 hour'::interval);
ERROR: step size cannot equal zero
-- --
-- Test behavior with a dynamic (time-varying) timezone abbreviation. -- Test behavior with a dynamic (time-varying) timezone abbreviation.
-- These tests rely on the knowledge that MSK (Europe/Moscow standard time) -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)

15
src/test/regress/sql/timestamp.sql
View File

@@ -243,3 +243,18 @@ SELECT i,
-- timestamp numeric fields constructor -- timestamp numeric fields constructor
SELECT make_timestamp(2014,12,28,6,30,45.887); SELECT make_timestamp(2014,12,28,6,30,45.887);
-- generate_series for timestamp
select * from generate_series('2020-01-01 00:00'::timestamp,
'2020-01-02 03:00'::timestamp,
'1 hour'::interval);
-- errors
select * from generate_series('-infinity'::timestamp,
'2020-01-02 03:00'::timestamp,
'1 hour'::interval);
select * from generate_series('2020-01-01 00:00'::timestamp,
'infinity'::timestamp,
'1 hour'::interval);
select * from generate_series('2020-01-01 00:00'::timestamp,
'2020-01-02 03:00'::timestamp,
'0 hour'::interval);

15
src/test/regress/sql/timestamptz.sql
View File

@@ -334,6 +334,21 @@ SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
RESET TimeZone; RESET TimeZone;
-- generate_series for timestamptz
select * from generate_series('2020-01-01 00:00'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'1 hour'::interval);
-- errors
select * from generate_series('-infinity'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'1 hour'::interval);
select * from generate_series('2020-01-01 00:00'::timestamptz,
'infinity'::timestamptz,
'1 hour'::interval);
select * from generate_series('2020-01-01 00:00'::timestamptz,
'2020-01-02 03:00'::timestamptz,
'0 hour'::interval);
-- --
-- Test behavior with a dynamic (time-varying) timezone abbreviation. -- Test behavior with a dynamic (time-varying) timezone abbreviation.
-- These tests rely on the knowledge that MSK (Europe/Moscow standard time) -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)