This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1e728672bfa9273db046d2d6d994648b803de059 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 14:45:56 2016 +0100 Renommages version 5.0-xxx en 4.90x pour faciliter le passage en 5.0 + utilisation nouvelle layout de script de migration --- .../migration/AbstractDataSourceMigration.java | 8 +-- .../AbstractObserveMigrationCallBack.java | 73 +++++++++++----------- .../DataSourceMigrationForVersion_3_10.java | 10 +-- .../DataSourceMigrationForVersion_3_11.java | 12 ++-- .../DataSourceMigrationForVersion_3_12.java | 2 +- .../DataSourceMigrationForVersion_3_14.java | 8 +-- .../DataSourceMigrationForVersion_3_15.java | 6 +- .../DataSourceMigrationForVersion_3_16.java | 6 +- .../DataSourceMigrationForVersion_3_5.java | 24 ++----- .../DataSourceMigrationForVersion_3_7.java | 52 +++------------ .../DataSourceMigrationForVersion_3_8.java | 8 +-- .../DataSourceMigrationForVersion_3_9.java | 4 +- .../DataSourceMigrationForVersion_4_0.java | 2 +- .../DataSourceMigrationForVersion_4_0_1.java | 4 +- .../DataSourceMigrationForVersion_4_0_2.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 24 +++---- .../DataSourceMigrationForVersion_4_0_RC4.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 4 +- ...va => DataSourceMigrationForVersion_4_900.java} | 12 ++-- ...va => DataSourceMigrationForVersion_4_901.java} | 12 ++-- ...va => DataSourceMigrationForVersion_4_902.java} | 12 ++-- .../DataSourceMigrationForVersion_5_0.java | 8 +-- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- 25 files changed, 123 insertions(+), 178 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 7aaaa1f..ca7a548 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -86,11 +86,11 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback // FIXME A utiliser en version final 5.0 public static final Version V_5_0 = Versions.valueOf("5.0"); - public static final Version V_5_0__1 = Versions.valueOf("5.0-1"); + public static final Version V_4_900 = Versions.valueOf("4.900"); - public static final Version V_5_0__2 = Versions.valueOf("5.0-2"); + public static final Version V_4_901 = Versions.valueOf("4.901"); - public static final Version V_5_0__3 = Versions.valueOf("5.0-3"); + public static final Version V_4_902 = Versions.valueOf("4.902"); /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ @@ -98,7 +98,7 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, // FIXME A utiliser en version final 5.0 //V_5_0 - V_5_0__1, V_5_0__2, V_5_0__3 + V_4_900, V_4_901, V_4_902 }; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index e3b7c7e..99752bf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -52,7 +52,9 @@ import java.util.Set; */ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { - /** Logger. */ + /** + * Logger. + */ private static final Log log = LogFactory.getLog(AbstractObserveMigrationCallBack.class); private final String scriptSuffix; @@ -62,35 +64,6 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal this.scriptSuffix = scriptSuffix; } - protected String[] loadScript(String prefix) { - - String migrationScript = prefix + "-" + scriptSuffix + ".sql"; - String scriptPath = "/db/" + version.getVersion() + "/" + migrationScript; - - if (log.isInfoEnabled()) { - log.info("Will will load migration script: " + scriptPath); - } - - try (InputStream stream = getClass().getResourceAsStream(scriptPath)) { - String content = IOUtils.toString(stream, Charsets.UTF_8); - Set<String> result = new LinkedHashSet<>(); - for (String statement : content.split("\n")) { - - if (statement.startsWith("--")) { - // commentaire - continue; - } - result.add(statement); - } - - return result.toArray(new String[result.size()]); - - } catch (IOException e) { - throw new TopiaException("Could not load migration script: " + migrationScript, e); - } - } - - protected Set<String> getTopiaIds(TopiaSqlSupport topiaSqlSupport, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -100,17 +73,12 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal @Override public void execute(Connection connection) throws SQLException { String sql = String.format("SELECT topiaId FROM %s;", tableName); - PreparedStatement ps = connection.prepareStatement(sql); - try { + try (PreparedStatement ps = connection.prepareStatement(sql)) { ResultSet set = ps.executeQuery(); while (set.next()) { String id = set.getString(1); result.add(id); } - } catch (Exception e) { - throw new SQLException("Could not obtain ids for table " + tableName, e); - } finally { - ps.close(); } } }); @@ -118,10 +86,39 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal return result; } - protected void addScript(String prefix, List<String> queries) { - String[] migrationQueries = loadScript(prefix); + protected void addScript(String rank, String prefix, List<String> queries) { + + String[] migrationQueries = loadScript(rank, prefix); queries.addAll(Lists.newArrayList(migrationQueries)); } + + private String[] loadScript(String rank, String prefix) { + + String migrationScript = prefix + "-" + scriptSuffix + ".sql"; + String scriptPath = "/db/migration/V" + version.getValidName() + "_" + rank + "_" + migrationScript; + + if (log.isInfoEnabled()) { + log.info("Load migration script: " + scriptPath); + } + + try (InputStream stream = getClass().getResourceAsStream(scriptPath)) { + String content = IOUtils.toString(stream, Charsets.UTF_8); + Set<String> result = new LinkedHashSet<>(); + for (String statement : content.split("\n")) { + + if (statement.startsWith("--")) { + // commentaire + continue; + } + result.add(statement); + } + + return result.toArray(new String[result.size()]); + + } catch (IOException e) { + throw new TopiaException("Could not load migration script: " + migrationScript, e); + } + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java index 1fa4e0a..b858695 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java @@ -48,11 +48,11 @@ public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("remove-person", queries); - addScript("add-missing-fk", queries); - addScript("increase-comment-field", queries); - addScript("fix-sensorDataFormat", queries); - addScript("normalize-sections", queries); + addScript("01", "remove-person", queries); + addScript("02", "add-missing-fk", queries); + addScript("03", "increase-comment-field", queries); + addScript("04", "fix-sensorDataFormat", queries); + addScript("05", "normalize-sections", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java index 55db066..44d1ed0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java @@ -48,12 +48,12 @@ public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("remove-speciesGroup-obsolete-fields", queries); - addScript("add-country-on-transmitting-buoy", queries); - addScript("add-fpaZones", queries); - addScript("add-activity-ersId", queries); - addScript("add-person-country", queries); - addScript("add-harbours", queries); + addScript("01", "remove-speciesGroup-obsolete-fields", queries); + addScript("02", "add-country-on-transmitting-buoy", queries); + addScript("03", "add-fpaZones", queries); + addScript("04", "add-activity-ersId", queries); + addScript("05", "add-person-country", queries); + addScript("06", "add-harbours", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java index dece464..813d7de 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java @@ -48,7 +48,7 @@ public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("add-missing-boat", queries); + addScript("01", "add-missing-boat", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java index 0f60deb..2192843 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java @@ -48,10 +48,10 @@ public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("remove-hooksPerBasketCount-field", queries); - addScript("fix-targetsample-discarded-value", queries); - addScript("remove-orphan-seine-sample", queries); - addScript("remove-targetlength-discarded-field", queries); + addScript("01", "remove-hooksPerBasketCount-field", queries); + addScript("02", "fix-targetsample-discarded-value", queries); + addScript("03", "remove-orphan-seine-sample", queries); + addScript("04", "remove-targetlength-discarded-field", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java index a885f4b..2e7541a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java @@ -48,9 +48,9 @@ public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("change-tdr-integer-field-to-float", queries); - addScript("remove-set-longline-length-fields", queries); - addScript("remove-brancheline-fields", queries); + addScript("01", "change-tdr-integer-field-to-float", queries); + addScript("02", "remove-set-longline-length-fields", queries); + addScript("03", "remove-brancheline-fields", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index d8b7fd3..fdf5a57 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -60,10 +60,10 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration boolean showSql, boolean showProgression) { - addScript("add-gear-referential", queries); - addScript("add-gear-data", queries); + addScript("01", "add-gear-referential", queries); + addScript("02", "add-gear-data", queries); migrateTripSenneData(topiaSqlSupport, queries); - addScript("remove-tripSeine-seine", queries); + addScript("03", "remove-tripSeine-seine", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java index 6831832..fbece2e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java @@ -22,7 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; @@ -122,28 +121,14 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM addSpeciesList(queries, speciesThonIds, speciesFauneIds); // add longline schema - addLonglineSchema(queries); + addScript("02", "add-longline-schema", queries); // update common references - updateCommonReferences(queries); + addScript("03", "update-common-references", queries); // add longline references - addLonglineReferences(queries); - } - - protected void addLonglineSchema(List<String> queries) { - String[] migrationQueries = loadScript("add-longline-schema"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - - protected void addLonglineReferences(List<String> queries) { - String[] migrationQueries = loadScript("add-longline-references"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } + addScript("04", "add-longline-references", queries); - protected void updateCommonReferences(List<String> queries) { - String[] migrationQueries = loadScript("update-common-references"); - queries.addAll(Lists.newArrayList(migrationQueries)); } protected void translateModel(TopiaSqlSupport topiaSqlSupport, List<String> queries) { @@ -154,8 +139,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM removeUK(topiaSqlSupport, oldTableName, queries); } - String[] migrationQueries = loadScript("migration"); - queries.addAll(Lists.newArrayList(migrationQueries)); + addScript("01", "migration", queries); } protected void addSpeciesList(List<String> queries, Set<String> speciesThonIds, Set<String> speciesFauneIds) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java index f999b1f..8b21f9b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java @@ -22,7 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; @@ -49,47 +48,16 @@ public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveM boolean showSql, boolean showProgression) { - { - String[] migrationQueries = loadScript("rename-seine-model"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("remove-trip-organism"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("add-referential-needComment"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("normalize-triplongline"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("normalize-activitylongline"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("normalize-setlongline"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("normalize-catchlongline"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("normalize-tdr"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - { - String[] migrationQueries = loadScript("add-species-list"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } - - { - String[] migrationQueries = loadScript("increase-comment-field"); - queries.addAll(Lists.newArrayList(migrationQueries)); - } + addScript("01", "rename-seine-model", queries); + addScript("02", "remove-trip-organism", queries); + addScript("03", "add-referential-needComment", queries); + addScript("04", "normalize-triplongline", queries); + addScript("05", "normalize-activitylongline", queries); + addScript("06", "normalize-setlongline", queries); + addScript("07", "normalize-catchlongline", queries); + addScript("08", "normalize-tdr", queries); + addScript("09", "add-species-list", queries); + addScript("10", "increase-comment-field", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java index 96a36ce..9212ab2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java @@ -48,10 +48,10 @@ public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationC boolean showSql, boolean showProgression) { - addScript("fix-person", queries); - addScript("fix-branchelinecomposition", queries); - addScript("normalize-sensorused", queries); - addScript("normalize-tdr", queries); + addScript("01", "fix-person", queries); + addScript("02", "fix-branchelinecomposition", queries); + addScript("03", "normalize-sensorused", queries); + addScript("04", "normalize-tdr", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java index ad39efc..f5a11a7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java @@ -48,8 +48,8 @@ public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationC boolean showSql, boolean showProgression) { - addScript("add-dataFilename-attribute", queries); - addScript("fill-sensorDataFormat", queries); + addScript("01", "add-dataFilename-attribute", queries); + addScript("02", "fill-sensorDataFormat", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java index 77817f8..71214ca 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java @@ -49,7 +49,7 @@ public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationC boolean showProgression) { // See https://forge.codelutin.com/issues/7013 - addScript("empty", queries); + addScript("01", "empty", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index 3ec6a85..383091e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -66,7 +66,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv // See https://forge.codelutin.com/issues/7229 removeForeignKeys(tx, queries); - addScript("add-missing-fk", queries); + addScript("02", "add-missing-fk", queries); // See https://forge.codelutin.com/issues/7350 migrateGearUseFeaturesSeineMeasurementIds(tx, queries); @@ -183,7 +183,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv protected void prepareMigrationScript(TopiaSqlSupport tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { // See https://forge.codelutin.com/issues/7226 - addScript("remove-gender-column", queries); + addScript("01", "remove-gender-column", queries); super.prepareMigrationScript(tx, queries, showSql, showProgression); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java index c6b285d..79be582 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java @@ -65,7 +65,7 @@ public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserv protected void prepareMigrationScript(TopiaSqlSupport tx, List<String> queries, boolean showSql, boolean showProgression) { // See http://forge.codelutin.com/issues/7467 - addScript("remove-gender-column", queries); + addScript("01", "remove-gender-column", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index 1395a0a..5cb4edb 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java @@ -86,7 +86,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat if (result.contains("seine")) { - addScript("clean-program-gear-type", queries); + addScript("01", "clean-program-gear-type", queries); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index 734e8e8..c0f902c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -48,7 +48,9 @@ import java.util.Set; */ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObserveMigrationCallBack { - /** Logger. */ + /** + * Logger. + */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { @@ -68,10 +70,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse addMissingForeignKeys(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/6983 - loadScript("update-senne-gear-usedInTrip"); + addScript("02", "update-senne-gear-usedInTrip", queries); // See https://forge.codelutin.com/issues/6991 - loadScript("rename-unknown-longliner"); + addScript("03", "rename-unknown-longliner", queries); } @@ -82,7 +84,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } @Override - protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { + protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { // Nothing to do for h2 db } @@ -95,7 +97,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } @Override - protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { + protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "gear_gearcaracteristic", "gear"); removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "ocean_species", "species"); @@ -144,11 +146,11 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); - addScript("add-foreign-key-indexes", queries); + addScript("01", "add-foreign-key-indexes", queries); } - private void removeForeignKeyIndex(TopiaSqlSupport tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) { + private void removeForeignKeyIndex(TopiaSqlSupport tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) { tx.doSqlWork(new TopiaSqlWork() { @@ -229,10 +231,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse Set<Integer> indexIds = new HashSet<Integer>(); String sql = "SELECT indexrelid FROM pg_index " + - "WHERE indrelid = ? " + - "AND indkey = '" + attNum + "' " + - "AND indisunique = FALSE " + - "AND indisprimary = FALSE;"; + "WHERE indrelid = ? " + + "AND indkey = '" + attNum + "' " + + "AND indisunique = FALSE " + + "AND indisprimary = FALSE;"; PreparedStatement ps = connection.prepareStatement(sql); ps.setInt(1, oid); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java index 5640999..ca8f1c3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java @@ -50,7 +50,7 @@ public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrat // See https://forge.codelutin.com/issues/7013 - addScript("add-gear-data", queries); + addScript("01", "add-gear-data", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java index 4b23fa2..776807f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java @@ -54,7 +54,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse removeForeignKeyOnGearFseFeaturesMeasurementSeine(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/7142 - addScript("fix-gearUseFeatures-topiaIds", queries); + addScript("01", "fix-gearUseFeatures-topiaIds", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java index 0ebb072..539b6fd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java @@ -51,11 +51,11 @@ public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObse // See https://forge.codelutin.com/issues/6983 // Should have been donne in RC3, but was missed! - addScript("update-senne-gear-usedInTrip", queries); + addScript("01", "update-senne-gear-usedInTrip", queries); // See https://forge.codelutin.com/issues/6991 // Should have been donne in RC3, but was missed! - addScript("rename-unknown-longliner", queries); + addScript("02", "rename-unknown-longliner", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java similarity index 86% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java rename to observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java index 3ce6f53..99ad967 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java @@ -35,10 +35,10 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigrationCallBack { +public class DataSourceMigrationForVersion_4_900 extends AbstractObserveMigrationCallBack { - public DataSourceMigrationForVersion_5_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0__1, callBack, scriptSuffix); + public DataSourceMigrationForVersion_4_900(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_900, callBack, scriptSuffix); } @Override @@ -49,11 +49,11 @@ public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigratio // Suppression du champ open sur les entités anciennement du type Openable // See https://forge.codelutin.com/issues/7469 - addScript("remove_open_field", queries); + addScript("01", "remove_open_field", queries); } - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, H2DataSourceMigration.TYPE); @@ -61,7 +61,7 @@ public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigratio } - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java similarity index 86% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java rename to observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java index ee9282d..aed7b16 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java @@ -35,10 +35,10 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataSourceMigrationForVersion_5_0_2 extends AbstractObserveMigrationCallBack { +public class DataSourceMigrationForVersion_4_901 extends AbstractObserveMigrationCallBack { - public DataSourceMigrationForVersion_5_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0__2, callBack, scriptSuffix); + public DataSourceMigrationForVersion_4_901(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_901, callBack, scriptSuffix); } @Override @@ -49,11 +49,11 @@ public class DataSourceMigrationForVersion_5_0_2 extends AbstractObserveMigratio // Ajout des champs lastUpdate // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdateDate_field", queries); + addScript("01", "add_lastUpdateDate_field", queries); } - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_2 { + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, H2DataSourceMigration.TYPE); @@ -61,7 +61,7 @@ public class DataSourceMigrationForVersion_5_0_2 extends AbstractObserveMigratio } - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_2 { + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java similarity index 86% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_3.java rename to observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java index b857242..bf171c1 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java @@ -35,10 +35,10 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataSourceMigrationForVersion_5_0_3 extends AbstractObserveMigrationCallBack { +public class DataSourceMigrationForVersion_4_902 extends AbstractObserveMigrationCallBack { - public DataSourceMigrationForVersion_5_0_3(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0__3, callBack, scriptSuffix); + public DataSourceMigrationForVersion_4_902(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_902, callBack, scriptSuffix); } @Override @@ -49,11 +49,11 @@ public class DataSourceMigrationForVersion_5_0_3 extends AbstractObserveMigratio // Ajout de la table lastUpdateDate // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdateDate_table", queries); + addScript("01", "add_lastUpdateDate_table", queries); } - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_3 { + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, H2DataSourceMigration.TYPE); @@ -61,7 +61,7 @@ public class DataSourceMigrationForVersion_5_0_3 extends AbstractObserveMigratio } - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_3 { + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java index 5734c1b..6775e05 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java @@ -48,13 +48,7 @@ public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationC boolean showSql, boolean showProgression) { - // Suppression du champ open sur les entités anciennement du type Openable - // See https://forge.codelutin.com/issues/7469 - addScript("remove_open_field", queries); - - // Ajout des champs lastUpdate - // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdateDate_field", queries); + // Rien à faire } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java index 0f84698..ed44ea2 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -14,7 +14,7 @@ import java.util.TreeMap; */ public class ObserveFixtures { - public static final String DEFAULT_VERSION = "5.0-3"; + public static final String DEFAULT_VERSION = "4.902"; public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.