From 8ea0bea9becb206d6edd9d55f3112bc97e9aa031 Mon Sep 17 00:00:00 2001 From: nicksherron Date: Fri, 7 Feb 2020 12:51:11 -0500 Subject: [PATCH] internal/db: commandGet() support both sqlite and postgres --- internal/db.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/db.go b/internal/db.go index b04e48c..a055a69 100644 --- a/internal/db.go +++ b/internal/db.go @@ -126,16 +126,18 @@ func (cmd Command) commandGet() []Query { if connectionLimit != 1 { // postgres rows, err = DB.Query(`SELECT DISTINCT on ("command") command, "uuid", "created" from commands - where "user_id" in (select "id" from users where "token" = $1) limit $2`, cmd.Token, cmd.Limit) + where "user_id" in (select "id" from users where "token" = $1) + order by "command", "created" desc limit $2`, cmd.Token, cmd.Limit) }else { // sqlite rows, err = DB.Query(`SELECT "command", "uuid", "created" from commands where "user_id" in (select "id" from users where "token" = $1) - group by "command" limit $2`, cmd.Token, cmd.Limit) + group by "command" order by "created" desc limit $2`, cmd.Token, cmd.Limit) } } else { rows, err = DB.Query(`SELECT "command", "uuid", "created" from commands - where "user_id" in (select "id" from users where "token" = $1) limit $2`, cmd.Token, cmd.Limit) + where "user_id" in (select "id" from users where "token" = $1) + order by "created" desc limit $2`, cmd.Token, cmd.Limit) } if err != nil {