Mercurial > dive4elements > river
changeset 8582:17a3030bbda2
Update SQL-statements to schema-changes in rev 6d8d7425a6b5.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 16 Mar 2015 16:59:37 +0100 |
| parents | 073ea4bcea58 |
| children | 138feb491c8a |
| files | artifacts/doc/conf/meta-data.xml artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Mon Mar 16 15:36:38 2015 +0100 +++ b/artifacts/doc/conf/meta-data.xml Mon Mar 16 16:59:37 2015 +0100 @@ -1871,9 +1871,9 @@ bhs.description, bhsv.station, bhs.year - FROM bed_height_single bhs - JOIN bed_height_single_values bhsv - ON bhsv.bed_height_single_id = bhs.id + FROM bed_height bhs + JOIN bed_height_values bhsv + ON bhsv.bed_height_id = bhs.id WHERE bhs.river_id = ${river_id} AND bhsv.station BETWEEN ${fromkm} AND ${tokm}), csta @@ -2035,7 +2035,7 @@ '<BR>ursprüngliches Höhensystem: ' || old_em.name || '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || '<BR>Auswerter: ' || bhs.evaluation_by AS info - FROM bed_height_single bhs + FROM bed_height bhs JOIN bed_height_type bht ON bht.id = bhs.type_id JOIN location_system ls ON ls.id = location_system_id JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Mon Mar 16 15:36:38 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Mon Mar 16 16:59:37 2015 +0100 @@ -32,8 +32,8 @@ public static final String SQL_SELECT_SINGLE = "SELECT bhsv.height, bhsv.station, bhsv.data_gap," + " bhsv.sounding_width, bhs.year" + - " FROM bed_height_single bhs" + - " JOIN bed_height_single_values bhsv on bhsv.bed_height_single_id = bhs.id"; + " FROM bed_height bhs" + + " JOIN bed_height_values bhsv on bhsv.bed_height_id = bhs.id"; public static final String ID_CLAUSE = " WHERE bhs.id = :height_id" + @@ -46,7 +46,7 @@ /** Query to get name (description) for wst_id. */ public static final String SQL_SELECT_DESCR_SINGLE = - "SELECT description FROM bed_height_single "+ + "SELECT description FROM bed_height "+ "WHERE id = :height_id"; private BedHeightFactory() {