nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-27 00:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a primary key to calendar_alarm table.

Browse Source 
Also fixed a bug in scripts/refresh-alarms.php if there was an
alarm with a duplicate trigger.

This is part of the fix for #276.
This commit is contained in:
Andrew Ruthven 2023-02-04 21:22:57 +13:00
parent 6819d6d7d1
commit e3b5c331be
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dba/davical.sql
View File

@ -403,13 +403,15 @@ CREATE TABLE addressbook_address_email (
CREATE TABLE calendar_alarm (
dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE,
count INT,
action TEXT,
trigger TEXT,
summary TEXT,
description TEXT,
next_trigger TIMESTAMP WITH TIME ZONE,
component TEXT, -- The full text of the component
trigger_state CHAR DEFAULT 'N' -- 'N' => 'New/Needs setting', 'A' = 'Active', 'O' = 'Old'
trigger_state CHAR DEFAULT 'N', -- 'N' => 'New/Needs setting', 'A' = 'Active', 'O' = 'Old'
UNIQUE (dav_id, count)
);

10
dba/patches/1.3.4.sql
View File

@ -41,6 +41,16 @@ UPDATE addressbook_address_tel
CREATE UNIQUE INDEX addressbook_address_tel_pk
ON addressbook_address_tel(dav_id, count);
-- calendar_alarm
ALTER TABLE calendar_alarm
ADD COLUMN count INT;
UPDATE calendar_alarm
SET count = nextval('temporary_seq');
CREATE UNIQUE INDEX calendar_alarms_pk
ON calendar_alarm(dav_id, count);
-- Tidy up after ourselves.
DROP SEQUENCE temporary_seq;

6
inc/WritableCollection.php
View File

@ -326,10 +326,11 @@ EOSQL;
$components = $vcal->GetComponents();
$qry->SetSql('INSERT INTO calendar_alarm ( dav_id, action, trigger, summary, description, component, next_trigger )
VALUES( '.$dav_id.', :action, :trigger, :summary, :description, :component,
$qry->SetSql('INSERT INTO calendar_alarm ( dav_id, count, action, trigger, summary, description, component, next_trigger )
VALUES( '.$dav_id.', :count, :action, :trigger, :summary, :description, :component,
:related::timestamp with time zone + :related_trigger::interval )' );
$qry->Prepare();
$count = 0;
foreach( $components AS $component ) {
if ( $component->GetType() == 'VTIMEZONE' ) continue;
$alarms = $component->GetComponents('VALARM');
@ -370,6 +371,7 @@ EOSQL;
$qry->Bind(':component', $v->Render());
$qry->Bind(':related', $related );
$qry->Bind(':related_trigger', $related_trigger );
$qry->Bind(':count', $count++ );
$qry->Exec('PUT',__LINE__,__FILE__);
}
}

6
inc/caldav-PUT-functions.php
View File

@ -1270,10 +1270,11 @@ function write_alarms( $dav_id, vComponent $ical ) {
$alarms = $ical->GetComponents('VALARM');
if ( count($alarms) < 1 ) return;
$qry->SetSql('INSERT INTO calendar_alarm ( dav_id, action, trigger, summary, description, component, next_trigger )
VALUES( '.$dav_id.', :action, :trigger, :summary, :description, :component,
$qry->SetSql('INSERT INTO calendar_alarm ( dav_id, count, action, trigger, summary, description, component, next_trigger )
VALUES( '.$dav_id.', :count, :action, :trigger, :summary, :description, :component,
:related::timestamp with time zone + :related_trigger::interval )' );
$qry->Prepare();
$count = 0;
foreach( $alarms AS $v ) {
$trigger = array_merge($v->GetProperties('TRIGGER'));
if ( $trigger == null ) continue; // Bogus data.
@ -1314,6 +1315,7 @@ function write_alarms( $dav_id, vComponent $ical ) {
$qry->Bind(':component', $v->Render());
$qry->Bind(':related', $related_date->UTC() );
$qry->Bind(':related_trigger', $related_trigger );
$qry->Bind(':count', $count++ );
$qry->Exec('PUT',__LINE__,__FILE__);
}
}

8
scripts/refresh-alarms.php
View File

@ -165,14 +165,14 @@ if ( $qry->Exec() && $qry->rows() ) {
if ( isset($next) && $next < $expand_range_end ) {
if ( $args->debug ) printf( "refresh: Found next alarm instance on '%s'\n", $next->UTC() );
$sql = 'UPDATE calendar_alarm SET next_trigger = :next WHERE dav_id = :id AND component = :component';
$update = new AwlQuery( $sql, array( ':next' => $next->UTC(), ':id' => $alarm->dav_id, ':component' => $alarm->component ) );
$sql = 'UPDATE calendar_alarm SET next_trigger = :next WHERE dav_id = :id AND count = :count AND component = :component';
$update = new AwlQuery( $sql, array( ':next' => $next->UTC(), ':id' => $alarm->dav_id, ':count' => $alarm->count, ':component' => $alarm->component ) );
$update->Exec('refresh-alarms', __LINE__, __FILE__ );
}
else if ( $args->set_last && isset($last) && $last < $earliest ) {
if ( $args->debug ) printf( "refresh: Found past final alarm instance on '%s'\n", $last->UTC() );
$sql = 'UPDATE calendar_alarm SET next_trigger = :last WHERE dav_id = :id AND component = :component';
$update = new AwlQuery( $sql, array( ':last' => $last->UTC(), ':id' => $alarm->dav_id, ':component' => $alarm->component ) );
$sql = 'UPDATE calendar_alarm SET next_trigger = :last WHERE dav_id = :id AND count = :count AND component = :component';
$update = new AwlQuery( $sql, array( ':last' => $last->UTC(), ':id' => $alarm->dav_id, ':count' => $alarm->count, ':component' => $alarm->component ) );
$update->Exec('refresh-alarms', __LINE__, __FILE__ );
}
else if ( $args->debug && isset($next) && $next < $expand_range_end ) {