Author: bleny Date: 2011-06-27 14:19:22 +0000 (Mon, 27 Jun 2011) New Revision: 1354 Log: update migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-06-24 14:15:17 UTC (rev 1353) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-06-27 14:19:22 UTC (rev 1354) @@ -1,3 +1,4 @@ + /* * #%L * Wao :: Business @@ -866,17 +867,20 @@ "topiaId CHARACTER VARYING(255) PRIMARY KEY," + "topiaVersion BIGINT NOT NULL," + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + - "code CHARACTER VARYING(255)," + - "name TEXT);"); - queries.add("CREATE TABLE ObsDebCode_Regions (" + - "obsDebCode character varying(255) NOT NULL," + - "regions character varying(255) NOT NULL," + - "CONSTRAINT obsDebCode_fkey FOREIGN KEY (obsDebCode) " + - "REFERENCES ObsDebCode (topiaid) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION," + - "CONSTRAINT regions_fkey FOREIGN KEY (regions) " + - "REFERENCES TerrestrialLocation (topiaid) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION);"); + "code CHARACTER VARYING(255));"); + queries.add("CREATE TABLE ObsDebCodeDetails (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "obsDebCode CHARACTER VARYING(255)," + + "label TEXT," + + "region CHARACTER VARYING(255)," + + "CONSTRAINT obsDebCode_fkey FOREIGN KEY (obsDebCode) " + + "REFERENCES ObsDebCode (topiaId) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION," + + "CONSTRAINT region_fkey FOREIGN KEY (region) " + + "REFERENCES TerrestrialLocation (topiaId) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); } @Override @@ -983,7 +987,7 @@ } @Override - protected void addContactStateMotives(List<String> queries) { + protected void addContactStateMotives_3_0(List<String> queries) { queries.add("ALTER TABLE ContactStateMotif ADD code CHARACTER VARYING(255);"); queries.add("ALTER TABLE ContactStateMotif ADD name CHARACTER VARYING(1000);"); queries.add("ALTER TABLE ContactStateMotif ADD color CHARACTER VARYING(20);"); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-06-24 14:15:17 UTC (rev 1353) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-06-27 14:19:22 UTC (rev 1354) @@ -161,7 +161,7 @@ protected abstract void dropTranslations_3_0(List<String> queries); - protected abstract void addContactStateMotives(List<String> queries); + protected abstract void addContactStateMotives_3_0(List<String> queries); protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), @@ -546,7 +546,7 @@ dropTranslations_3_0(queries); - addContactStateMotives(queries); + addContactStateMotives_3_0(queries); String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings);