Browse Source

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

Regresion introduced by commit df8bc742fb35569372514fcb6a6278f2a80c2e3b.
Frédéric Guillot 1 year ago
parent
commit
78ff727064
1 changed files with 3 additions and 3 deletions
  1. 3 3
      internal/storage/feed_query_builder.go

+ 3 - 3
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: ""}
 		}