From 7ae8606da16eb578476b13659ca1e903d8a74af7 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Wed, 5 May 2021 13:31:01 +0200 Subject: [PATCH] appendFilters: only append relation if this relation hasn't been added --- tw/twmodel/helpers.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tw/twmodel/helpers.go b/tw/twmodel/helpers.go index ac8bcdc..a9a1df4 100644 --- a/tw/twmodel/helpers.go +++ b/tw/twmodel/helpers.go @@ -30,7 +30,10 @@ func appendFilters(q *orm.Query, filtersToAppend ...filterToAppend) (*orm.Query, if err != nil { return q, errors.Wrapf(err, "Couldn't build alias from relation name '%s'", f.relationName) } - q, err = f.filter.WhereWithAlias(q.Relation(f.relationName+"._"), alias) + if join := tableModel.GetJoin(f.relationName); join == nil { + q = q.Relation(f.relationName + "._") + } + q, err = f.filter.WhereWithAlias(q, alias) if err != nil { return q, errors.Wrapf(err, "Couldn't append filter for the relation '%s'", f.relationName) }