redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-06-14 01:21:30 +03:00
Code Activity

Add missing error checks and support for MGET in Scan()

Browse Source
This commit is contained in:
Kailash Nadh
2021-02-03 13:37:27 +05:30
parent e113512c18
commit 600f1665a0
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
command.go
View File

@ -375,9 +375,21 @@ func (cmd *SliceCmd) String() string {
// Scan scans the results from the map into a destination struct. The map keys
// are matched in the Redis struct fields by the `redis:"field"` tag.
func (cmd *SliceCmd) Scan(dest interface{}) error {
// Pass the list of keys and values. Skip the first to args (command, key),
// eg: HMGET map.
return hscan.Scan(cmd.args[2:], cmd.val, dest)
if cmd.err != nil {
return cmd.err
}
// Pass the list of keys and values.
// Skip the first two args for: HMGET key
var args []interface{}
if cmd.args[0] == "hmget" {
args = cmd.args[2:]
} else {
// Otherwise, it's: MGET field field ...
args = cmd.args[1:]
}
return hscan.Scan(args, cmd.val, dest)
}
func (cmd *SliceCmd) readReply(rd *proto.Reader) error {
@ -929,6 +941,10 @@ func (cmd *StringStringMapCmd) String() string {
// Scan scans the results from the map into a destination struct. The map keys
// are matched in the Redis struct fields by the `redis:"field"` tag.
func (cmd *StringStringMapCmd) Scan(dest interface{}) error {
if cmd.err != nil {
return cmd.err
}
// Pass the list of keys and values. Skip the first to args (command, key),
// eg: HGETALL map.
var (