[Dive4elements-commits] [PATCH 2 of 2] Merged

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1366036194 -7200
# Node ID 06f3a36a83b61009642b69b650653df0543da49b
# Parent  4fd0c250779c733c9299d04216dda30568600a75
# Parent  e89d922df8ae6d730b02ed57682d457df2cff56a
Merged.

diff -r 4fd0c250779c -r 06f3a36a83b6 flys-backend/doc/schema/oracle-minfo.sql
--- a/flys-backend/doc/schema/oracle-minfo.sql	Mon Apr 15 16:29:25 2013 +0200
+++ b/flys-backend/doc/schema/oracle-minfo.sql	Mon Apr 15 16:29:54 2013 +0200
@@ -207,6 +207,7 @@
     main_channel            NUMBER(38,3) NOT NULL,
     shear_stress            NUMBER(38,3) NOT NULL,
     PRIMARY KEY(id),
+    UNIQUE (station, flow_velocity_model_id),
     CONSTRAINT fk_fvv_flow_velocity_model_id FOREIGN KEY (flow_velocity_model_id) REFERENCES flow_velocity_model(id) ON DELETE CASCADE
 );
 
diff -r 4fd0c250779c -r 06f3a36a83b6 flys-backend/doc/schema/postgresql-minfo.sql
--- a/flys-backend/doc/schema/postgresql-minfo.sql	Mon Apr 15 16:29:25 2013 +0200
+++ b/flys-backend/doc/schema/postgresql-minfo.sql	Mon Apr 15 16:29:54 2013 +0200
@@ -207,6 +207,7 @@
     main_channel            NUMERIC NOT NULL,
     shear_stress            NUMERIC NOT NULL,
     PRIMARY KEY(id),
+    UNIQUE (station, flow_velocity_model_id),
     CONSTRAINT fk_fvv_flow_velocity_model_id FOREIGN KEY (flow_velocity_model_id) REFERENCES flow_velocity_model(id) ON DELETE CASCADE
 );