This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5bd34d74a329c5844166c7338b0d45c3edfc917e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 11:55:31 2016 +0100 fix migrations --- .../entities/migration/DataSourceMigrationForVersion_5_1.java | 5 +++-- .../entities/migration/ObserveMigrationConfigurationProvider.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java index fd17c4b..a58fbbd 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java @@ -2,6 +2,7 @@ package fr.ird.observe.entities.migration; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -92,8 +93,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'"); - return preparedStatement; + return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE label1 = '" + finalLengthMeasureType + "'"); } @Override @@ -108,6 +108,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } invalidCodes.add(lengthMeasureType); } else { + sizeMeasureTypeId = StringUtils.replace(sizeMeasureTypeId, ".longline", ""); queries.add(String.format("UPDATE observe_common.species SET sizeMeasureType = '%s' WHERE lengthMeasureType = '%s'", sizeMeasureTypeId, lengthMeasureType)); } } diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java index 47de7f6..3a5a63d 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java @@ -61,7 +61,7 @@ public final class ObserveMigrationConfigurationProvider { TreeMap<Version, Class<?>> builder = new TreeMap<>(); - Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration.versions").getTypesAnnotatedWith(MigrationVersion.class); + Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration").getTypesAnnotatedWith(MigrationVersion.class); for (Class<?> type : types) { Version version = getVersion(type); builder.put(version, type); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.