Merge pull request #891 from luechtdiode/fix/890-missing-barren

Fix/890 missing barren
luechtdiode · Apr 22, 2024 · f637cb2 · f637cb2
2 parents 718186f + 951d1ea
commit f637cb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.seidel</groupId>
 	<artifactId>KuTu</artifactId>
-	<version>2.3.12</version>
+	<version>2.3.13</version>
 
 	<inceptionYear>2014</inceptionYear>
 

diff --git a/src/main/scala/ch/seidel/kutu/domain/DisziplinService.scala b/src/main/scala/ch/seidel/kutu/domain/DisziplinService.scala
@@ -38,13 +38,10 @@ abstract trait DisziplinService extends DBService with WettkampfResultMapper {
                and r.durchgang in (#${durchgang.mkString("'", "','", "'")})
              )
              inner join wettkampf wk on (wk.id = r.wettkampf_id)
-             left outer join wertung w on (
-               w.wettkampf_id = r.wettkampf_id
-               and (w.riege = r.name or w.riege2 = r.name)
-             )
              where
                r.wettkampf_id = $wettkampf
-               and w.id is null
+               and (not exists(select 1 from wertung w where w.wettkampf_id = r.wettkampf_id and (w.riege2 <> ''))
+                or not exists(select 1 from wertung w where w.wettkampf_id = r.wettkampf_id and (w.riege = r.name or w.riege2 = r.name)))
              order by
                4 --wd.ord
        """.as[(Long, String, String, Int)]