Mercurial > dive4elements > river
changeset 4009:60d88ec49c3b
S(Q) relation. Fixed SQL statements.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2012 01:42:45 +0200 |
| parents | fea3d9210948 |
| children | bf687419feba |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java |
| diffstat | 2 files changed, 21 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Oct 02 00:00:30 2012 +0200 +++ b/flys-artifacts/ChangeLog Tue Oct 02 01:42:45 2012 +0200 @@ -1,3 +1,9 @@ +2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: + Fixed typo in TOTAL_SQL. Forget to join GSIEBSATZ table in FRACTIONS_SQL. + + * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Tue Oct 02 00:00:30 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Tue Oct 02 01:42:45 2012 +0200 @@ -26,7 +26,7 @@ "SELECT " + "m.Q_BPEGEL AS Q_BPEGEL,"+ "m.TSCHWEB AS TSCHWEB," + - "m.TSAND AS TSAND" + + "m.TSAND AS TSAND " + "FROM MESSUNG m " + "JOIN STATION s ON m.STATIONID = s.STATIONID " + "JOIN GEWAESSER r ON s.GEWAESSERID = r.GEWAESSERID " + @@ -49,17 +49,17 @@ "m.TSAND AS TSAND," + "gp.GTRIEB AS GTRIEB," + "m.TGESCHIEBE AS TGESCHIEBE," + - "sie.SIEB01 AS SIEB01, sie.SIEB02 AS SIEB02," + - "sie.SIEB03 AS SIEB03, sie.SIEB04 AS SIEB04," + - "sie.SIEB05 AS SIEB05, sie.SIEB06 AS SIEB06," + - "sie.SIEB07 AS SIEB07, sie.SIEB08 AS SIEB08," + - "sie.SIEB09 AS SIEB09, sie.SIEB10 AS SIEB10," + - "sie.SIEB11 AS SIEB11, sie.SIEB12 AS SIEB12," + - "sie.SIEB13 AS SIEB13, sie.SIEB14 AS SIEB14," + - "sie.SIEB15 AS SIEB15, sie.SIEB16 AS SIEB16," + - "sie.SIEB17 AS SIEB17, sie.SIEB18 AS SIEB18," + - "sie.SIEB19 AS SIEB19, sie.SIEB20 AS SIEB20," + - "sie.SIEB21 AS SIEB21," + + "si.SIEB01 AS SIEB01, si.SIEB02 AS SIEB02," + + "si.SIEB03 AS SIEB03, si.SIEB04 AS SIEB04," + + "si.SIEB05 AS SIEB05, si.SIEB06 AS SIEB06," + + "si.SIEB07 AS SIEB07, si.SIEB08 AS SIEB08," + + "si.SIEB09 AS SIEB09, si.SIEB10 AS SIEB10," + + "si.SIEB11 AS SIEB11, si.SIEB12 AS SIEB12," + + "si.SIEB13 AS SIEB13, si.SIEB14 AS SIEB14," + + "si.SIEB15 AS SIEB15, si.SIEB16 AS SIEB16," + + "si.SIEB17 AS SIEB17, si.SIEB18 AS SIEB18," + + "si.SIEB19 AS SIEB19, si.SIEB20 AS SIEB20," + + "si.SIEB21 AS SIEB21," + "gs.RSIEB01 AS RSIEB01, gs.RSIEB02 AS RSIEB02," + "gs.RSIEB03 AS RSIEB03, gs.RSIEB04 AS RSIEB04," + "gs.RSIEB05 AS RSIEB05, gs.RSIEB06 AS RSIEB06," + @@ -74,9 +74,10 @@ "FROM MESSUNG m " + "JOIN STATION s ON m.STATIONID = s.STATIONID " + "JOIN GEWAESSER r ON s.GEWAESSERID = r.GEWAESSERID " + - "JOIN glotrechte g ON m.MESSUNGID = g.MESSUNGID " + - "JOIN gprobe gp ON g.GLOTRECHTEID = gp.GLOTRECHTEID " + + "JOIN GLOTRECHTE g ON m.MESSUNGID = g.MESSUNGID " + + "JOIN GPROBE gp ON g.GLOTRECHTEID = gp.GLOTRECHTEID " + "JOIN GSIEBUNG gs ON g.GLOTRECHTEID = gs.GLOTRECHTEID " + + "JOIN GSIEBSATZ si ON m.GSIEBSATZID = si.GSIEBSATZID " + "WHERE " + "r.NAME = :river_name " + "AND m.Q_BPEGEL IS NOT NULL " +