# HG changeset patch # User Tim Englich # Date 1263905151 0 # Node ID 292f0c8d356c03e399acc129587d966238fc673d # Parent cef17cc90fd019c33a5081ef4f9444d1554ff070 Do some Bugfixes after testing the Schema and Testdata against an Oracle 10.2 DBMS. gnv-artifacts/trunk@571 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r cef17cc90fd0 -r 292f0c8d356c gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Tue Jan 19 10:58:46 2010 +0000 +++ b/gnv-artifacts/ChangeLog Tue Jan 19 12:45:51 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-19 Tim Englich + + * doc/schema/externalinterface_testdata.sql, + doc/schema/externalinterface_schema.sql: + Do some Bugfixes after testing the Schema and Testdata against an Oracle 10.2 DBMS. + 2010-01-19 Ingo Weinzierl * src/main/java/de/intevation/gnv/state/State.java, diff -r cef17cc90fd0 -r 292f0c8d356c gnv-artifacts/doc/schema/externalinterface_schema.sql --- a/gnv-artifacts/doc/schema/externalinterface_schema.sql Tue Jan 19 10:58:46 2010 +0000 +++ b/gnv-artifacts/doc/schema/externalinterface_schema.sql Tue Jan 19 12:45:51 2010 +0000 @@ -52,9 +52,6 @@ ALTER TABLE layer_has_parameter ADD PRIMARY KEY (id_mapservice,id_layer,id_parameter); -ALTER TABLE layer_has_parameter ADD (CONSTRAINT fk_layer_has_parameter1) - FOREIGN KEY (id_mapservice) - REFERENCES fis_has_mapservice(id_mapservice); /** * Lookuptabelle ob ein Mapservice genau einen Parameter darstellt. diff -r cef17cc90fd0 -r 292f0c8d356c gnv-artifacts/doc/schema/externalinterface_testdata.sql --- a/gnv-artifacts/doc/schema/externalinterface_testdata.sql Tue Jan 19 10:58:46 2010 +0000 +++ b/gnv-artifacts/doc/schema/externalinterface_testdata.sql Tue Jan 19 12:45:51 2010 +0000 @@ -1,13 +1,10 @@ -INSERT INTO fis_has_mapservice (id_fis,id_mapservice) VALUES -('modeldata','BSH_IMS_Prediction_Model_Salinity'), -('marnet','BSH_IMS_Marine_Environment_Monitoring_Network'); +INSERT INTO fis_has_mapservice (id_fis,id_mapservice) VALUES ('modeldata','BSH_IMS_Prediction_Model_Salinity'); +INSERT INTO fis_has_mapservice (id_fis,id_mapservice) VALUES ('marnet','BSH_IMS_Marine_Environment_Monitoring_Network'); -INSERT INTO mapservice_has_parameter(id_mapservice,id_parameter) VALUES -('BSH_IMS_Prediction_Model_Salinity',2); +INSERT INTO mapservice_has_parameter(id_mapservice,id_parameter) VALUES ('BSH_IMS_Prediction_Model_Salinity',2); -INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES -('BSH_IMS_Marine_Environment_Monitoring_Network', 'Sealevel', null, ?), -('BSH_IMS_Marine_Environment_Monitoring_Network', 'Temperature', null, 1), -('BSH_IMS_Marine_Environment_Monitoring_Network', 'Salinity', null, 2), -('BSH_IMS_Marine_Environment_Monitoring_Network', 'OxygenSaturation', null, 31), -('BSH_IMS_Marine_Environment_Monitoring_Network', 'Current', null, ?); \ No newline at end of file +INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES ('BSH_IMS_Marine_Environment_Monitoring_Network', 'Sealevel', null, ?); +INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES ('BSH_IMS_Marine_Environment_Monitoring_Network', 'Temperature', null, 1); +INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES ('BSH_IMS_Marine_Environment_Monitoring_Network', 'Salinity', null, 2); +INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES ('BSH_IMS_Marine_Environment_Monitoring_Network', 'OxygenSaturation', null, 31); +INSERT INTO layer_has_parameter(id_mapservice,id_layer,id_group,id_parameter) VALUES ('BSH_IMS_Marine_Environment_Monitoring_Network', 'Current', null, ?); \ No newline at end of file