# HG changeset patch # User Tom Gottfried # Date 1410163380 -7200 # Node ID ceeeaf228fe4c98dc28e8a1abba43c2e1977befb # Parent ebdf34cae14d5e69259318115d3776d101a94161 Allow fractions without SQ-time interval (suspended sediment) to be loaded. diff -r ebdf34cae14d -r ceeeaf228fe4 artifacts/doc/conf/meta-data.xml --- a/artifacts/doc/conf/meta-data.xml Fri Sep 05 20:57:31 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Sep 08 10:03:00 2014 +0200 @@ -1491,7 +1491,7 @@ ON ms.id = syv.measurement_station_id JOIN rivers r ON ms.river_id = r.id JOIN time_intervals ti ON sy.time_interval_id = ti.id - JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id + LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id WHERE r.id = ${river_id} AND ms.station BETWEEN ${fromkm} AND ${tokm} @@ -1523,7 +1523,7 @@ JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id JOIN time_intervals ti ON sy.time_interval_id = ti.id - JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id + LEFT JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id JOIN units u ON sy.unit_id = u.id WHERE r.id = ${river_id}