Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java @ 8072:5f28aa1be795
SCHEMA CHANGE: rename database tables from yield to load_ls according to respective classes.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Wed, 06 Aug 2014 19:17:12 +0200 |
parents | 5e3f4b4fcb28 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Tue Aug 05 18:28:04 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Wed Aug 06 19:17:12 2014 +0200 @@ -41,49 +41,49 @@ public static final String LOAD_DATA_CACHE_NAME = "sedimentload-data"; /** Query to get description and start year of single type - * sediment_yields. */ + * sediment_load_lss. */ public static final String SQL_SELECT_SINGLES = "SELECT DISTINCT " + " sy.description AS description, " + " ti.start_time AS year " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " 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 " + " WHERE r.name = :name " + " AND ti.stop_time IS NULL " + " AND syv.station BETWEEN :startKm AND :endKm"; - /** Query to get fraction name of single sediment_yield. */ + /** Query to get fraction name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_TIMES_BY_ID = "SELECT DISTINCT " + " ti.start_time AS starttime, " + " ti.stop_time AS stoptime " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN time_intervals ti ON ti.id = sy.time_interval_id " + " WHERE sy.id = :id "; - /** Query to get fraction name of single sediment_yield. */ + /** Query to get fraction name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_FRACTION_BY_ID = "SELECT DISTINCT " + " gf.name AS fraction " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN grain_fraction gf ON gf.id = grain_fraction_id " + " WHERE sy.id = :id "; - /** Query to get unit name of single sediment_yield. */ + /** Query to get unit name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_UNIT_BY_ID = "SELECT DISTINCT " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN units u ON u.id = unit_id " + " WHERE sy.id = :id "; - /** Query to get description of single sediment_yield. */ + /** Query to get description of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_BY_ID = "SELECT DISTINCT " + " sy.description AS description " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " WHERE sy.id = :id "; /** Query to get description, name and time range for official @@ -92,9 +92,9 @@ "SELECT DISTINCT " + " ti.start_time AS startYear, " + " ti.stop_time AS end " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " 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 " + " WHERE r.name = :name " + " AND ti.stop_time IS NOT NULL " + @@ -109,9 +109,9 @@ " ti.start_time AS startYear, " + " ti.stop_time AS end, " + " u.name AS unit" + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " 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 units u ON u.id = sy.unit_id " + " WHERE r.name = :name " + @@ -126,8 +126,8 @@ " syv.station AS km, " + " u.name AS unit, " + " gf.name AS fraction " + - " FROM sediment_yield sy " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " FROM sediment_load_ls sy " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN units u ON u.id = sy.unit_id" + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " WHERE sy.id = :id" + @@ -140,10 +140,10 @@ " syv.value AS load, " + " syv.station AS km, " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id" + " WHERE r.name = :name " + @@ -161,10 +161,10 @@ " syv.value AS load, " + " syv.station AS km, " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id" + " WHERE r.name = :name " + @@ -178,7 +178,7 @@ " sy.description AS description, " + " ti.start_time AS startYear, " + " ti.stop_time AS end " + - "FROM sediment_yield sy " + + "FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + @@ -196,10 +196,10 @@ " syv.station AS km," + " ti.stop_time AS endYear, " + " u.name AS unit" + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id " + " WHERE r.name = :name " +