summaryrefslogtreecommitdiff
path: root/archaeological_finds/models_treatments.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-12 11:12:04 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-12 11:12:04 +0100
commitec2133d2efbf971ec4d0d55065409a93c2dcb63e (patch)
treec05be38b482d9e72caeadee15abc06997e5cb275 /archaeological_finds/models_treatments.py
parentccdcfc84c998f181ccf6b2a541174753cf6bbdab (diff)
downloadIshtar-ec2133d2efbf971ec4d0d55065409a93c2dcb63e.tar.bz2
Ishtar-ec2133d2efbf971ec4d0d55065409a93c2dcb63e.zip
Fix treatments views on cyclic treatments (should not happen but...)
Diffstat (limited to 'archaeological_finds/models_treatments.py')
-rw-r--r--archaeological_finds/models_treatments.py4
1 files changed, 4 insertions, 0 deletions
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;