jason/cpolis
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 56 Wiki Activity

Add error checking for every occurance of rows.Next()

Browse Source
This commit is contained in:
Jason Streifling 2025-02-03 10:40:54 +01:00
parent 1cf537662a
commit 9b4a8e1890
6 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/backend/articles.go
View File

@ -175,6 +175,10 @@ func (db *DB) GetCertainArticles(attribute string, value bool) ([]*Article, erro
articleList = append(articleList, article) articleList = append(articleList, article)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return articleList, nil return articleList, nil
} }
@ -243,6 +247,13 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
articleList = append(articleList, article) articleList = append(articleList, article)
} }
if err = rows.Err(); err != nil {
if rollbackErr := tx.Rollback(); rollbackErr != nil {
log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
}
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
if err = tx.Commit(); err != nil { if err = tx.Commit(); err != nil {
return nil, fmt.Errorf("error committing transaction when getting articles of issue %v: %v", issueID, err) return nil, fmt.Errorf("error committing transaction when getting articles of issue %v: %v", issueID, err)
} }

4
cmd/backend/articles_authors.go
View File

@ -68,6 +68,10 @@ func (db *DB) GetArticleAuthors(c *Config, articleID int64) ([]*User, error) {
authors = append(authors, author) authors = append(authors, author)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return authors, nil return authors, nil
} }

4
cmd/backend/articles_contributors.go
View File

@ -68,6 +68,10 @@ func (db *DB) GetArticleContributors(c *Config, articleID int64) ([]*User, error
contributors = append(contributors, contributor) contributors = append(contributors, contributor)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return contributors, nil return contributors, nil
} }

4
cmd/backend/articles_tags.go
View File

@ -61,6 +61,10 @@ func (db *DB) GetArticleTags(articleID int64) ([]*Tag, error) {
tags = append(tags, tag) tags = append(tags, tag)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return tags, nil return tags, nil
} }

4
cmd/backend/tags.go
View File

@ -31,5 +31,9 @@ func (db *DB) GetTagList() ([]*Tag, error) {
tagList = append(tagList, tag) tagList = append(tagList, tag)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return tagList, nil return tagList, nil
} }

10
cmd/backend/users.go
View File

@ -453,8 +453,6 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
func (db *DB) GetAllUsers(c *Config) ([]*User, error) { func (db *DB) GetAllUsers(c *Config) ([]*User, error) {
var aesFirstName, aesLastName, aesEmail string var aesFirstName, aesLastName, aesEmail string
var err error
query := "SELECT id, username, first_name, last_name, email, profile_pic_link, role FROM users" query := "SELECT id, username, first_name, last_name, email, profile_pic_link, role FROM users"
rows, err := db.Query(query) rows, err := db.Query(query)
@ -487,6 +485,10 @@ func (db *DB) GetAllUsers(c *Config) ([]*User, error) {
users = append(users, user) users = append(users, user)
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return users, nil return users, nil
} }
@ -526,6 +528,10 @@ func (db *DB) GetAllUsersMap(c *Config) (map[int64]*User, error) {
users[user.ID] = user users[user.ID] = user
} }
if err = rows.Err(); err != nil {
return nil, fmt.Errorf("error iterating over rows: %v", err)
}
return users, nil return users, nil
} }