From 09a48735a43951496ee23b55134e2d2d5cc23d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 26 Mar 2025 20:45:01 -0700 Subject: [PATCH] fix: name "external_id": converting NULL to string is unsupported Regresion introduced by commit df8bc742fb35569372514fcb6a6278f2a80c2e3b. --- internal/storage/feed_query_builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/storage/feed_query_builder.go b/internal/storage/feed_query_builder.go index 7e56f977..b8a9eee0 100644 --- a/internal/storage/feed_query_builder.go +++ b/internal/storage/feed_query_builder.go @@ -204,7 +204,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) { for rows.Next() { var feed model.Feed var iconID sql.NullInt64 - var externalIconID string + var externalIconID sql.NullString var tz string 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) } - if iconID.Valid { - feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: iconID.Int64, ExternalIconID: externalIconID} + if iconID.Valid && externalIconID.Valid { + feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: iconID.Int64, ExternalIconID: externalIconID.String} } else { feed.Icon = &model.FeedIcon{FeedID: feed.ID, IconID: 0, ExternalIconID: ""} }