appendFilters: only append relation if this relation hasn't been added
This commit is contained in:
parent
102ae553be
commit
7ae8606da1
|
@ -30,7 +30,10 @@ func appendFilters(q *orm.Query, filtersToAppend ...filterToAppend) (*orm.Query,
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return q, errors.Wrapf(err, "Couldn't build alias from relation name '%s'", f.relationName)
|
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 {
|
if err != nil {
|
||||||
return q, errors.Wrapf(err, "Couldn't append filter for the relation '%s'", f.relationName)
|
return q, errors.Wrapf(err, "Couldn't append filter for the relation '%s'", f.relationName)
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue