diff flys-aft/src/main/resources/sql/flys-common.properties @ 4775:d9f1202cef78

Do the pairing of FLYS and AFT discharge tables by the field 'ABFLUSSTAFEL.BFG_ID' in AFT and 'discharge_table.bfg_id' in FLYS. TODO: Create new column in discharge_tabel.
author Sascha L. Teichmann <teichmann@intevation.de>
date Sat, 05 Jan 2013 14:52:55 +0100
parents a310aceb2e51
children 46e984a3d576
line wrap: on
line diff
--- a/flys-aft/src/main/resources/sql/flys-common.properties	Sat Jan 05 13:46:27 2013 +0100
+++ b/flys-aft/src/main/resources/sql/flys-common.properties	Sat Jan 05 14:52:55 2013 +0100
@@ -14,12 +14,21 @@
 next.timeinterval.id = SELECT NEXTVAL('TIME_INTERVALS_ID_SEQ') AS time_interval_id
 insert.timeinterval = INSERT INTO time_intervals (id, start_time, stop_time) VALUES (:id, :start_time, :stop_time)
 next.discharge.id = SELECT NEXTVAL('DISCHARGE_TABLES_ID_SEQ') AS discharge_table_id
-insert.dischargetable = INSERT INTO discharge_tables (id, gauge_id, description, kind, time_interval_id) \
-                        VALUES (:id, :gauge_id, :description, 1, :time_interval_id)
+insert.dischargetable = \
+    INSERT INTO discharge_tables \
+    (id, gauge_id, description, bfg_id, kind, time_interval_id) \
+    VALUES (:id, :gauge_id, :description, :bfg_id, 1, :time_interval_id)
 select.discharge.table.values = SELECT id, w, q FROM discharge_table_values WHERE table_id = :table_id
 next.discharge.table.values.id = SELECT NEXTVAL('DISCHARGE_TABLE_VALUES_ID_SEQ') AS discharge_table_values_id
 insert.discharge.table.value = INSERT INTO discharge_table_values (id, table_id, w, q) VALUES (:id, :table_id, :w, :q)
 delete.discharge.table.value = DELETE FROM discharge_table_values WHERE id = :id
-select.gauge.discharge.tables = SELECT dt.id AS id, dt.description AS description, ti.start_time AS start_time, ti.stop_time AS stop_time \
-                               FROM discharge_tables dt LEFT OUTER JOIN time_intervals ti ON dt.time_interval_id = ti.id \
-                               WHERE gauge_id = :gauge_id
+select.gauge.discharge.tables = \
+    SELECT \
+        dt.id AS id, \
+        dt.description AS description, \
+        ti.start_time AS start_time, \
+        ti.stop_time AS stop_time, \
+        dt.bfg_id AS bfg_id \
+    FROM discharge_tables dt \
+    LEFT OUTER JOIN time_intervals ti ON dt.time_interval_id = ti.id \
+    WHERE gauge_id = :gauge_id

http://dive4elements.wald.intevation.org