Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 29eb6b9f by Tony CHEMIT at 2017-08-13T10:47:28+02:00 [WIDOWS] Il arrive que l'application ne parvienne pas à supprimer le fichier i18n.zip (See #816) - - - - - 4a50aad3 by Tony CHEMIT at 2017-08-13T10:47:32+02:00 Problème de la migration targetLength.sizeMeasureType (See #835 #570) - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql - persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql - persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-common.sql - test/src/main/resources/db/6.902/dataForTestLongline.sql.gz - test/src/main/resources/db/6.902/dataForTestSeine.sql.gz - test/src/main/resources/db/6.902/referentiel.sql.gz Changes: ===================================== client/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ObserveRunner.java +++ b/client/src/main/java/fr/ird/observe/client/ObserveRunner.java @@ -505,7 +505,11 @@ public abstract class ObserveRunner extends ApplicationRunner { ZipUtil.uncompressFiltred(archive, directory.getParentFile()); } finally { if (Files.exists(archive.toPath())) { - Files.delete(archive.toPath()); + try { + Files.delete(archive.toPath()); + } catch (IOException e) { + log.error(String.format("Could not delete i18n archive %s", archive)); + } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -170,15 +170,15 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC } }); - Set<String> unkownCodes = new HashSet<>(lengthMeasureTypes); - unkownCodes.removeAll(knownSizeMeasureTypeMapping.keySet()); - unkownCodes.removeAll(existingSizeMeasureMapping.keySet()); + Set<String> unknownCodes = new HashSet<>(lengthMeasureTypes); + unknownCodes.removeAll(knownSizeMeasureTypeMapping.keySet()); + unknownCodes.removeAll(existingSizeMeasureMapping.keySet()); - if (!unkownCodes.isEmpty()) { + if (!unknownCodes.isEmpty()) { // migration impossible, il manque encore des référentiels // ce cas ne devrait jamais arrivé - throw new IllegalStateException("Les types de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(unkownCodes) + " sont requis pour la migration mais n'ont pas été trouvés en base."); + throw new IllegalStateException("Les types de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(unknownCodes) + " sont requis pour la migration mais n'ont pas été trouvés en base."); } @@ -222,7 +222,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC 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)); + queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); } } { ===================================== persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql +++ b/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql @@ -30,11 +30,14 @@ UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referen ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255); UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code ='PDL') WHERE measureType = 1; -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL') WHERE measureType = 2; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where topiaid='fr.ird.observe.entities.referentiel.longline.SizeMeasureType#1433499466774#0.529249255312607') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where topiaid ='fr.ird.observe.entities.referentiel.longline.SizeMeasureType#1433499465700#0.0902433863375336') WHERE measureType = 2; ALTER TABLE observe_seine.targetlength DROP COLUMN measureType; - ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255); + +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); + ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 VARCHAR(255); ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql +++ b/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql @@ -32,10 +32,13 @@ UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referen ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255); UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code='PDL') WHERE measureType = 1; -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL') WHERE measureType = 2; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where topiaid='fr.ird.observe.entities.referentiel.longline.SizeMeasureType#1433499466774#0.529249255312607') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where topiaid ='fr.ird.observe.entities.referentiel.longline.SizeMeasureType#1433499465700#0.0902433863375336') WHERE measureType = 2; ALTER TABLE observe_seine.targetlength DROP COLUMN measureType CASCADE; - ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255); + +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); + ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 VARCHAR(255); ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-common.sql +++ b/persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-common.sql @@ -19,9 +19,6 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255); -ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); - ALTER TABLE observe_common.lengthweightparameter ADD COLUMN sizeMeasureType VARCHAR(255); ALTER TABLE observe_common.lengthweightparameter ADD CONSTRAINT FK_LENGTH_WEIGHT_PARAMETER_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); UPDATE observe_common.lengthweightparameter SET sizeMeasureType = ( SELECT sizeMeasureType FROM observe_common.species s WHERE s.topiaId = species); ===================================== test/src/main/resources/db/6.902/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.902/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.902/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.902/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.902/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.902/referentiel.sql.gz and b/test/src/main/resources/db/6.902/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0ab03958893fcf7798a15c7c7a5... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0ab03958893fcf7798a15c7c7a5... You're receiving this email because of your account on gitlab.com.