Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/StaticSQFactory.java @ 8412:17db08570637
SCHEMA CHANGE: removed superfluous columns station and river_id from measurement_stations and adapted other components accordingly.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 15 Oct 2014 19:20:26 +0200 |
| parents | a9bd4a23a852 |
| children | 9a5b3079aad4 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/StaticSQFactory.java Wed Oct 15 14:58:46 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/StaticSQFactory.java Wed Oct 15 19:20:26 2014 +0200 @@ -34,7 +34,10 @@ "ti.start_time AS start_time," + "ti.stop_time AS stop_time, " + "ms.name AS station_name, " + - "ms.station AS station_km, " + + "CASE WHEN r.km_up = 1 AND ra.b IS NOT NULL " + + "THEN ra.b " + + "ELSE ra.a " + + "END AS station_km, " + "ms.measurement_type AS measurement_type, " + "sqv.parameter AS parameter, " + "sqv.a AS a, " + @@ -42,9 +45,11 @@ "sqv.qmax AS qmax " + "FROM sq_relation sq " + "JOIN time_intervals ti ON ti.id = sq.time_interval_id " + - "JOIN rivers r ON r.id = sq.river_id " + "JOIN sq_relation_value sqv ON sqv.sq_relation_id = sq.id " + - "JOIN measurement_station ms ON sqv.measurement_station_id = ms.id "; + "JOIN measurement_station ms " + + "ON sqv.measurement_station_id = ms.id " + + "JOIN ranges ra ON ra.id = ms.range_id " + + "JOIN rivers r ON r.id = ra.river_id "; public static final String STATION_CLAUSE = "WHERE " +