omg-team/craft-bot
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fixes
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Timofey.Kovalev 2021-06-24 00:20:20 +03:00
parent 95093616a0
commit 70594a62d2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dataBase.go
View File

@ -134,10 +134,6 @@ func (db *dbLayer) getPlayerByID(ctx context.Context, id string) (*Player, error
row := db.db.QueryRowContext(ctx, query, id) row := db.db.QueryRowContext(ctx, query, id)
if err := row.Err(); err != nil { 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) 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) err := fetchPlayer(row, &p)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
return nil, err 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) row := db.db.QueryRowContext(ctx, query, name)
if err := row.Err(); err != nil { 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) 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) err := fetchPlayer(row, &p)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
return nil, err return nil, err
} }
@ -178,10 +178,6 @@ func (db *dbLayer) getKillsByPlayerID(ctx context.Context, playerID string) (int
row := db.db.QueryRowContext(ctx, query, playerID) row := db.db.QueryRowContext(ctx, query, playerID)
if err := row.Err(); err != nil { 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) 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) err := row.Scan(&killsNum)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return 0, nil
}
return 0, errors.Wrap(err, "Failed to fetch data base") return 0, errors.Wrap(err, "Failed to fetch data base")
} }