Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Small optimization for #21073 (#21459)

Browse source 
Small optimization for #21073
This commit is contained in:
Victor Lyuboslavsky 2024-08-21 10:54:42 -05:00 committed by GitHub
parent dc207e913d
commit f00e985850
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/fleet/mdm.go
View file

@ -753,18 +753,23 @@ func (c *MDMCommandsAlreadySent) Scan(src interface{}) error {
if src == nil {
return nil
}
var commands MDMCommandsAlreadySent
if err := json.Unmarshal(src.([]byte), &commands); err != nil {
return err
}
raw, ok := src.([]byte)
if !ok {
return fmt.Errorf("unexpected type for MDMCommandsAlreadySent: %T", src)
}
// Filter out [null] command types which MySQL returns when there are no commands_already_sent.
// For details, see: https://dev.mysql.com/doc/refman/8.4/en/aggregate-functions.html#function_json-arrayagg
if len(commands) == 1 && commands[0] == "" {
if string(raw) == "[null]" {
*c = nil
} else {
*c = commands
return nil
}
var commands MDMCommandsAlreadySent
if err := json.Unmarshal(raw, &commands); err != nil {
return err
}
*c = commands
return nil
}