use %w for errors from feed query builder. use errors.Is to check sql errors in storage/feed.go

Author: shizunge

storage/feed.go

@@ -143,7 +143,7 @@ func (s *Storage) WeeklyFeedEntryCount(userID, feedID int64) (int, error) {
 	err := s.db.QueryRow(query, userID, feedID).Scan(&weeklyCount)
 
 	switch {
-	case err == sql.ErrNoRows:
+	case errors.Is(err, sql.ErrNoRows):
 		return 0, nil
 	case err != nil:
 		return 0, fmt.Errorf(`store: unable to fetch weekly count for feed #%d: %v`, feedID, err)
@@ -159,7 +159,7 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
 	feed, err := builder.GetFeed()
 
 	switch {
-	case err == sql.ErrNoRows:
+	case errors.Is(err, sql.ErrNoRows):
 		return nil, nil
 	case err != nil:
 		return nil, fmt.Errorf(`store: unable to fetch feed #%d: %v`, feedID, err)

storage/feed_query_builder.go

@@ -179,7 +179,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 
 	rows, err := f.store.db.Query(query, f.args...)
 	if err != nil {
-		return nil, fmt.Errorf(`store: unable to fetch feeds: %v`, err)
+		return nil, fmt.Errorf(`store: unable to fetch feeds: %w`, err)
 	}
 	defer rows.Close()
 
@@ -224,7 +224,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 		)
 
 		if err != nil {
-			return nil, fmt.Errorf(`store: unable to fetch feeds row: %v`, err)
+			return nil, fmt.Errorf(`store: unable to fetch feeds row: %w`, err)
 		}
 
 		if iconID != nil {
@@ -275,7 +275,7 @@ func (f *FeedQueryBuilder) fetchFeedCounter() (unreadCounters map[int64]int, rea
 
 	rows, err := f.store.db.Query(query, f.counterArgs...)
 	if err != nil {
-		return nil, nil, fmt.Errorf(`store: unable to fetch feed counts: %v`, err)
+		return nil, nil, fmt.Errorf(`store: unable to fetch feed counts: %w`, err)
 	}
 	defer rows.Close()
 
@@ -286,7 +286,7 @@ func (f *FeedQueryBuilder) fetchFeedCounter() (unreadCounters map[int64]int, rea
 		var status string
 		var count int
 		if err := rows.Scan(&feedID, &status, &count); err != nil {
-			return nil, nil, fmt.Errorf(`store: unable to fetch feed counter row: %v`, err)
+			return nil, nil, fmt.Errorf(`store: unable to fetch feed counter row: %w`, err)
 		}
 
 		if status == model.EntryStatusRead {