From 70594a62d2cda1fe6c331afacc0e05e7878dd480 Mon Sep 17 00:00:00 2001 From: "Timofey.Kovalev" Date: Thu, 24 Jun 2021 00:20:20 +0300 Subject: [PATCH] small fixes --- dataBase.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dataBase.go b/dataBase.go index e843160..570c175 100644 --- a/dataBase.go +++ b/dataBase.go @@ -134,10 +134,6 @@ func (db *dbLayer) getPlayerByID(ctx context.Context, id string) (*Player, error row := db.db.QueryRowContext(ctx, query, id) if err := row.Err(); err != nil { - if err == sql.ErrNoRows { - return nil, nil - } - return nil, errors.Wrapf(err, "Failed to run db query [%s]", query) } @@ -145,6 +141,10 @@ func (db *dbLayer) getPlayerByID(ctx context.Context, id string) (*Player, error err := fetchPlayer(row, &p) if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + return nil, err } @@ -156,10 +156,6 @@ func (db *dbLayer) getPlayerByName(ctx context.Context, name string) (*Player, e row := db.db.QueryRowContext(ctx, query, name) if err := row.Err(); err != nil { - if err == sql.ErrNoRows { - return nil, nil - } - return nil, errors.Wrapf(err, "Failed to run db query [%s]", query) } @@ -167,6 +163,10 @@ func (db *dbLayer) getPlayerByName(ctx context.Context, name string) (*Player, e err := fetchPlayer(row, &p) if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + return nil, err } @@ -178,10 +178,6 @@ func (db *dbLayer) getKillsByPlayerID(ctx context.Context, playerID string) (int row := db.db.QueryRowContext(ctx, query, playerID) if err := row.Err(); err != nil { - if err == sql.ErrNoRows { - return 0, nil - } - return 0, errors.Wrapf(err, "Failed to run db query [%s]", query) } @@ -189,6 +185,10 @@ func (db *dbLayer) getKillsByPlayerID(ctx context.Context, playerID string) (int err := row.Scan(&killsNum) if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return 0, nil + } + return 0, errors.Wrap(err, "Failed to fetch data base") }