From ec2133d2efbf971ec4d0d55065409a93c2dcb63e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 12 Jan 2017 11:12:04 +0100 Subject: Fix treatments views on cyclic treatments (should not happen but...) --- archaeological_finds/models_treatments.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'archaeological_finds/models_treatments.py') diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 5054d0da1..945ff57d4 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -318,6 +318,8 @@ class FindUpstreamTreatments(AbsFindTreatments): FROM archaeological_finds_find c JOIN rel_tree p ON c.upstream_treatment_id = p.downstream_treatment_id + AND c.upstream_treatment_id != + ALL(p.path_info[0:cardinality(p.path_info)-1]) ) SELECT DISTINCT find_id, path_info, level FROM rel_tree ORDER BY find_id; @@ -370,6 +372,8 @@ class FindDownstreamTreatments(AbsFindTreatments): FROM archaeological_finds_find c JOIN rel_tree p ON c.downstream_treatment_id = p.upstream_treatment_id + AND c.downstream_treatment_id != + ALL(p.path_info[0:cardinality(p.path_info)-1]) ) SELECT DISTINCT find_id, path_info, level FROM rel_tree ORDER BY find_id; -- cgit v1.2.3