[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User mschaefer
# Date 1528988633 -7200
# Node ID 910334e2eadd9aa04fc46738bb59ac9f3ea0ac11
# Parent  bb929b444ea5f17c73f44e33539dc469ade51fa4
# Parent  8d4e7e08dbc0f8b3b4c87380ac74816188b37ed5
Merge

diff -r bb929b444ea5 -r 910334e2eadd backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionAggregateValue.java
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionAggregateValue.java	Thu Jun 14 16:57:14 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionAggregateValue.java	Thu Jun 14 17:03:53 2018 +0200
@@ -106,7 +106,7 @@
                 + " FROM collision_values v INNER JOIN collision s ON v.collision_id=s.id"
                 + " WHERE (collision_id=:parent)"
                 + " AND (station BETWEEN (:kmLo - 0.0001) AND (:kmHi + 0.0001))"
-                + " GROUP BY FLOOR(station+0.4999);").addScalar("station", StandardBasicTypes.DOUBLE)
+                + " GROUP BY FLOOR(station+0.4999)").addScalar("station", StandardBasicTypes.DOUBLE)
                 .addScalar("count", StandardBasicTypes.INTEGER).addScalar("date_min", StandardBasicTypes.DATE)
                 .addScalar("date_max", StandardBasicTypes.DATE).addScalar("gauge_w", StandardBasicTypes.DOUBLE);
         query.setInteger("parent", parent.getId());