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 f134c8df6abcf024b862e50d4a91e22e35af5762 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:28:36 2016 +0100 skip empty code --- .../DataSourceMigrationForVersion_5_1.java | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 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 a58fbbd..f55cba7 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 @@ -84,6 +84,9 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC for (String lengthMeasureType : lengthMeasureTypes) { lengthMeasureType = lengthMeasureType.trim(); + if (lengthMeasureType.isEmpty()) { + continue; + } if (missingCodesMapping.containsKey(lengthMeasureType)) { lengthMeasureType = missingCodesMapping.get(lengthMeasureType); } @@ -102,7 +105,24 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } }); + if (sizeMeasureTypeId == null && finalLengthMeasureType.equals("LF")) { + + // For test purposes... + sizeMeasureTypeId = topiaSqlSupport.findSingleResult(new TopiaSqlQuery<String>() { + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE label1 = 'TL'"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + } if (sizeMeasureTypeId == null) { + if (log.isWarnEnabled()) { log.warn("Impossible de trouver la type de mesure de taille pour le code: " + lengthMeasureType); } @@ -137,10 +157,8 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } }); - String newIdPrefix = "fr.ird.observe.entities.referentiel.SizeMeasureType#1#"; - int count = 0; for (String oldId : oldIds) { - String newId = newIdPrefix + (count++); + String newId = StringUtils.replace(oldId, ".longline", ""); queries.add(String.format("UPDATE observe_common.sizeMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_longline.sizeMeasure SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); @@ -160,11 +178,8 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } }); - String newIdPrefix = "fr.ird.observe.entities.referentiel.WeightMeasureType#1#"; - - int count = 0; for (String oldId : oldIds) { - String newId = newIdPrefix + (count++); + String newId = StringUtils.replace(oldId, ".longline", ""); queries.add(String.format("UPDATE observe_common.weightMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_longline.weightMeasure SET weightMeasureType2 = '%s' WHERE weightMeasureType = '%s'", newId, oldId)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.