Author: echatellier Date: 2012-09-26 10:03:00 +0200 (Wed, 26 Sep 2012) New Revision: 3789 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3789 Log: Ajout des requete v4.2.1 dans la migration v4.0 car celle si est pas tr?\195?\168s bien cod?\195?\169?\195?\169, mais c'est n?\195?\169c?\195?\169ssaire. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-09-25 14:50:02 UTC (rev 3788) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-09-26 08:03:00 UTC (rev 3789) @@ -105,6 +105,10 @@ tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + // migration v 4.1.2 (mais necessaire de la faire avant sinon le findByTopiaId va planter + tx.executeSQL("alter table POPULATION add column groupmin integer default 0"); + tx.executeSQL("alter table POPULATION add column groupmax integer default 0"); + // build new equation for maturity group for (Object[] maturityRow : maturityGroupResult) { String population = (String)maturityRow[0]; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2012-09-25 14:50:02 UTC (rev 3788) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2012-09-26 08:03:00 UTC (rev 3789) @@ -34,7 +34,7 @@ import org.nuiton.util.Version; /** - * Migration between version 4.0 and 4.1. + * Migration between version 4.1 and 4.2.1. * * @author chatellier * @version $Revision$ @@ -61,8 +61,10 @@ protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - - queries.add("alter table POPULATION add column groupmin integer default 0;"); - queries.add("alter table POPULATION add column groupmax integer default 0;"); + + // utilisation du if not exists parce que potentiellement + // déjà fait un v 4.0 + queries.add("alter table POPULATION add column IF NOT EXISTS groupmin integer default 0"); + queries.add("alter table POPULATION add column IF NOT EXISTS groupmax integer default 0"); } }