james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2026-06-09 18:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

feedstate fixes

Browse Source
This commit is contained in:
nkanaev
2026-05-18 20:18:33 +01:00
parent 85f3956b24
commit 847ec3861a
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/feedstate.go
View File

@@ -102,7 +102,7 @@ func (s *Storage) UpdateFeedState(feedID int64, params UpdateFeedStateParams) (b
) )
on conflict (feed_id) do update set on conflict (feed_id) do update set
last_refreshed = coalesce(:last_refreshed, last_refreshed), last_refreshed = coalesce(:last_refreshed, last_refreshed),
last_error = coalesce(:last_error, last_modified), last_error = coalesce(:last_error, last_error),
http_lmod = coalesce(:http_lmod, http_lmod), http_lmod = coalesce(:http_lmod, http_lmod),
http_etag = coalesce(:http_etag, http_etag) http_etag = coalesce(:http_etag, http_etag)
`, `,

10
src/storage/migration.go
View File

@@ -366,11 +366,11 @@ func m13_consolidate_feed_states(tx *sql.Tx) error {
, http_etag , http_etag
) )
select select
f.id, f.id
coalesce(h.last_refreshed, 0), , coalesce(h.last_refreshed, 0)
coalesce(e.error, '') , coalesce(e.error, '')
coalesce(h.last_modified, ''), , coalesce(h.last_modified, '')
coalesce(h.etag, ''), , coalesce(h.etag, '')
from feeds f from feeds f
left join http_states h on f.id = h.feed_id left join http_states h on f.id = h.feed_id
left join feed_errors e on f.id = e.feed_id left join feed_errors e on f.id = e.feed_id

6
src/storage/storage_test.go
View File

@@ -9,9 +9,11 @@ import (
func testDB() *Storage { func testDB() *Storage {
log.SetOutput(io.Discard) log.SetOutput(io.Discard)
db, _ := New(":memory:") db, err := New(":memory:")
if err != nil {
panic(err)
}
log.SetOutput(os.Stderr) log.SetOutput(os.Stderr)
log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
return db return db
} }