mirror of
https://github.com/miniflux/v2.git
synced 2025-06-27 16:36:00 +00:00
fix: name "external_id": converting NULL to string is unsupported
Regresion introduced by commit df8bc742fb
.
This commit is contained in:
parent
54dad707a4
commit
09a48735a4
1 changed files with 3 additions and 3 deletions
|
@ -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: ""}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue