nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-03-13 08:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handle when dtstart is null.

Browse Source
This commit is contained in:
Andrew McMillan 2009-05-12 13:13:54 +12:00
parent f4c3292b62
commit 52e0f29dbd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dba/rrule_functions.sql
View File

@ -641,13 +641,19 @@ DECLARE
repeatrule ALIAS FOR $3;
in_mindate ALIAS FOR $4;
in_maxdate ALIAS FOR $5;
base_date TIMESTAMP WITH TIME ZONE;
mindate TIMESTAMP WITH TIME ZONE;
maxdate TIMESTAMP WITH TIME ZONE;
BEGIN
IF dtstart IS NULL OR dtend IS NULL THEN
IF dtstart IS NULL THEN
RETURN NULL;
END IF;
IF dtend IS NULL THEN
base_date := dtstart;
ELSE
base_date := dtend;
END IF;
IF in_mindate IS NULL THEN
mindate := current_date - '10 years'::interval;
@ -659,14 +665,14 @@ BEGIN
maxdate := current_date + '10 years'::interval;
ELSE
-- If we add the duration onto the event, then an overlap occurs if dtend <= increased end of range.
maxdate := in_maxdate + (dtend - dtstart);
maxdate := in_maxdate + (base_date - dtstart);
END IF;
IF repeatrule IS NULL THEN
RETURN (dtstart <= maxdate AND dtend >= mindate);
RETURN (dtstart <= maxdate AND base_date >= mindate);
END IF;
SELECT d INTO mindate FROM rrule_event_instances_range( dtend, repeatrule, mindate, maxdate, 3 ) d LIMIT 1;
SELECT d INTO mindate FROM rrule_event_instances_range( base_date, repeatrule, mindate, maxdate, 60 ) d LIMIT 1;
RETURN FOUND;
END;