Mercurial > dive4elements > river
changeset 7868:03b28800d47b
merged.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Tue, 13 May 2014 17:27:14 +0200 |
parents | 5ec28ef7026b (current diff) 0c74b5f8de17 (diff) |
children | 0c88a5d30ca2 58ba8fbe8070 |
files | |
diffstat | 2 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/doc/schema/oracle-minfo.sql Tue May 13 17:07:26 2014 +0200 +++ b/backend/doc/schema/oracle-minfo.sql Tue May 13 17:27:14 2014 +0200 @@ -150,11 +150,11 @@ CREATE SEQUENCE POROSITY_ID_SEQ; CREATE TABLE porosity ( - id NUMBER NOT NULL, - river_id NUMBER NOT NULL, - depth_id NUMBER NOT NULL, + id NUMBER(38,0) NOT NULL, + river_id NUMBER(38,0) NOT NULL, + depth_id NUMBER(38,0) NOT NULL, description VARCHAR(256), - time_interval_id NUMBER NOT NULL, + time_interval_id NUMBER(38,0) NOT NULL, PRIMARY KEY(id), CONSTRAINT fk_p_river_id FOREIGN KEY (river_id) REFERENCES rivers(id) ON DELETE CASCADE, CONSTRAINT fk_p_depth_id FOREIGN KEY (depth_id) REFERENCES depths(id), @@ -165,11 +165,11 @@ CREATE SEQUENCE POROSITY_VALUES_ID_SEQ; CREATE TABLE porosity_values ( - id NUMBER NOT NULL, - porosity_id NUMBER NOT NULL, - station NUMBER NOT NULL, - shore_offset NUMBER, - porosity NUMBER NOT NULL, + id NUMBER(38,0) NOT NULL, + porosity_id NUMBER(38,0) NOT NULL, + station DOUBLE PRECISION NOT NULL, + shore_offset DOUBLE PRECISION, + porosity DOUBLE PRECISION NOT NULL, description VARCHAR(256), PRIMARY KEY(id), CONSTRAINT fk_pv_porosity_id FOREIGN KEY(porosity_id) REFERENCES porosity(id) ON DELETE CASCADE
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java Tue May 13 17:07:26 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java Tue May 13 17:27:14 2014 +0200 @@ -19,7 +19,6 @@ import java.math.BigDecimal; import java.text.NumberFormat; -import java.text.ParseException; import java.util.ArrayList; import java.util.Date;