diff --git a/sync/service/postgres.go b/sync/service/postgres.go index e3196ef..c55868b 100644 --- a/sync/service/postgres.go +++ b/sync/service/postgres.go @@ -19,6 +19,7 @@ var migrations = []string{ `CREATE TABLE items (id TEXT PRIMARY KEY, kind TEXT, updated TIMESTAMP, deleted BOOLEAN, body TEXT)`, `CREATE INDEX idx_items_updated ON items(updated)`, `CREATE INDEX idx_items_kind ON items(kind)`, + `ALTER TABLE items ADD COLUMN recurrer JSONB, ADD COLUMN recur_next TIMESTAMP`, } var ( @@ -58,14 +59,16 @@ func NewPostgres(host, port, dbname, user, password string) (*Postgres, error) { func (p *Postgres) Update(item item.Item) error { _, err := p.db.Exec(` - INSERT INTO items (id, kind, updated, deleted, body) - VALUES ($1, $2, $3, $4, $5) + INSERT INTO items (id, kind, updated, deleted, body, recurrer, recur_next) + VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (id) DO UPDATE SET kind = EXCLUDED.kind, updated = EXCLUDED.updated, deleted = EXCLUDED.deleted, - body = EXCLUDED.body`, - item.ID, item.Kind, item.Updated, item.Deleted, item.Body) + body = EXCLUDED.body, + recurrer = EXCLUDED.recurrer, + recur_next = EXCLUDED.recur_next`, + item.ID, item.Kind, item.Updated, item.Deleted, item.Body, item.Recurrer, item.RecurNext) if err != nil { return fmt.Errorf("%w: %v", ErrPostgresFailure, err) } @@ -74,7 +77,7 @@ func (p *Postgres) Update(item item.Item) error { func (p *Postgres) Updated(ks []item.Kind, t time.Time) ([]item.Item, error) { query := ` - SELECT id, kind, updated, deleted, body + SELECT id, kind, updated, deleted, body, recurrer, recur_next FROM items WHERE updated > $1` args := []interface{}{t} @@ -97,7 +100,7 @@ func (p *Postgres) Updated(ks []item.Kind, t time.Time) ([]item.Item, error) { result := make([]item.Item, 0) for rows.Next() { var item item.Item - if err := rows.Scan(&item.ID, &item.Kind, &item.Updated, &item.Deleted, &item.Body); err != nil { + if err := rows.Scan(&item.ID, &item.Kind, &item.Updated, &item.Deleted, &item.Body, &item.Recurrer, &item.RecurNext); err != nil { return nil, fmt.Errorf("%w: %v", ErrPostgresFailure, err) } result = append(result, item)