fix #7756 allowig direction to be null again
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 12 Sep 2018 13:46:25 +0000 (15:46 +0200)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 12 Sep 2018 13:46:37 +0000 (15:46 +0200)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java

index 1a663a0174df9bceb868f09dafde8e6c80577c1b..49b6004e9f8148ce0cc3d450906d211c3176ae12 100755 (executable)
@@ -1006,9 +1006,12 @@ public class TaxonDaoHibernateImpl
     private String prepareTaxonRelationshipQuery(Set<TaxonRelationshipType> types, boolean includeUnpublished,
             Direction direction, boolean isCount) {
         String selectStr = isCount? " count(rel) as n ":" rel ";
-        String result = "SELECT " + selectStr +
-             " FROM TaxonRelationship rel " +
-             " WHERE rel."+direction+" = :relatedTaxon";
+        String result = "SELECT " + selectStr + " FROM TaxonRelationship rel ";
+        if(direction != null){
+            result += " WHERE rel."+direction+" = :relatedTaxon";
+        } else {
+            result += " WHERE (rel.relatedFrom = :relatedTaxon OR rel.relatedTo = :relatedTaxon )";
+        }
         if (types != null){
             result += " AND rel.type IN (:types) ";
         }