From add232d1dd5d31d48819e871feb839aa6712cab7 Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Fri, 2 Dec 2022 13:15:09 +0000 Subject: [PATCH] fix: correct where statement for AppByOIDCClientID (#4815) Co-authored-by: Silvan --- internal/query/app.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/internal/query/app.go b/internal/query/app.go index 5ce5dc7fb..6d1f39340 100644 --- a/internal/query/app.go +++ b/internal/query/app.go @@ -429,18 +429,17 @@ func (q *Queries) AppByClientID(ctx context.Context, clientID string, withOwnerR defer func() { span.EndWithError(err) }() stmt, scan := prepareAppQuery() - var eq []sq.Sqlizer - eq = append(eq, sq.And{ - sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}, + eq := sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} + if !withOwnerRemoved { + eq[AppColumnOwnerRemoved.identifier()] = false + } + query, args, err := stmt.Where(sq.And{ + eq, sq.Or{ sq.Eq{AppOIDCConfigColumnClientID.identifier(): clientID}, sq.Eq{AppAPIConfigColumnClientID.identifier(): clientID}, }, - }) - if !withOwnerRemoved { - eq = append(eq, sq.Eq{AppColumnOwnerRemoved.identifier(): false}) - } - query, args, err := stmt.Where(eq).ToSql() + }).ToSql() if err != nil { return nil, errors.ThrowInternal(err, "QUERY-Dfge2", "Errors.Query.SQLStatement") }