Skip to content

fix bug in queryResultData when query fails with error #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix bug in queryResultData when query fails with error #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e86494
fix bug in queryResultData when query fails with error (e.g. we are r…
May 4, 2018
73af55d
fix indentation
May 4, 2018
5e9c720
fix error in QueryRowsMap
Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions sqlutils/sqlutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ import (
"encoding/json"
"errors"
"fmt"
_ "github.com/go-sql-driver/mysql"
"github.com/openark/golib/log"
"strconv"
"strings"
"sync"

_ "github.com/go-sql-driver/mysql"
"github.com/openark/golib/log"
)

// RowMap represents one row in a result set. Its objective is to allow
Expand Down Expand Up @@ -204,8 +205,10 @@ func QueryRowsMap(db *sql.DB, query string, on_row func(RowMap) error, args ...i
}()

rows, err := db.Query(query, args...)
defer rows.Close()
if err != nil && err != sql.ErrNoRows {
if rows != nil {
defer rows.Close()
}
if err != nil && err != sql.ErrNoRows {
return log.Errore(err)
}
err = ScanRowsToMaps(rows, on_row)
Expand All @@ -223,7 +226,9 @@ func queryResultData(db *sql.DB, query string, retrieveColumns bool, args ...int

columns := []string{}
rows, err := db.Query(query, args...)
defer rows.Close()
if rows != nil {
defer rows.Close()
}
if err != nil && err != sql.ErrNoRows {
return EmptyResultData, columns, log.Errore(err)
}
Expand Down