oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-06-27 16:36:00 +00:00
Code Wiki Activity

fix: name "external_id": converting NULL to string is unsupported

Browse source 
Regresion introduced by commit df8bc742fb.
This commit is contained in:
Frédéric Guillot 2025-03-26 20:45:01 -07:00
parent 54dad707a4
commit 78ff727064
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/storage/feed_query_builder.go
View file

@ -204,7 +204,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
for rows.Next() { for rows.Next() {
var feed model.Feed var feed model.Feed
var iconID sql.NullInt64 var iconID sql.NullInt64
var externalIconID string var externalIconID sql.NullString
var tz string var tz string
feed.Category = &model.Category{} feed.Category = &model.Category{}
@ -257,8 +257,8 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
return nil, fmt.Errorf(`store: unable to fetch feeds row: %w`, err) return nil, fmt.Errorf(`store: unable to fetch feeds row: %w`, err)
} }
if iconID.Valid { if iconID.Valid && externalIconID.Valid {
feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: iconID.Int64, ExternalIconID: externalIconID} feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: iconID.Int64, ExternalIconID: externalIconID.String}
} else { } else {
feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: 0, ExternalIconID: ""} feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: 0, ExternalIconID: ""}
} }