Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ObserveRunner.java
    ... ... @@ -505,7 +505,11 @@ public abstract class ObserveRunner extends ApplicationRunner {
    505 505 
                         ZipUtil.uncompressFiltred(archive, directory.getParentFile());
    506 506 
                     } finally {
    507 507 
                         if (Files.exists(archive.toPath())) {
    508 
    -                        Files.delete(archive.toPath());
    508 
    +                        try {
    509 
    +                            Files.delete(archive.toPath());
    510 
    +                        } catch (IOException e) {
    511 
    +                            log.error(String.format("Could not delete i18n archive %s", archive));
    512 
    +                        }
    509 513 
                         }
    510 514 
                     }
    511 515

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java
    ... ... @@ -170,15 +170,15 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC
    170 170 
                 }
    171 171 
             });
    172 172
    173 
    -        Set<String> unkownCodes = new HashSet<>(lengthMeasureTypes);
    174 
    -        unkownCodes.removeAll(knownSizeMeasureTypeMapping.keySet());
    175 
    -        unkownCodes.removeAll(existingSizeMeasureMapping.keySet());
    173 
    +        Set<String> unknownCodes = new HashSet<>(lengthMeasureTypes);
    174 
    +        unknownCodes.removeAll(knownSizeMeasureTypeMapping.keySet());
    175 
    +        unknownCodes.removeAll(existingSizeMeasureMapping.keySet());
    176 176
    177 
    -        if (!unkownCodes.isEmpty()) {
    177 
    +        if (!unknownCodes.isEmpty()) {
    178 178
    179 179 
                 // migration impossible, il manque encore des référentiels
    180 180 
                 // ce cas ne devrait jamais arrivé
    181 
    -            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.");
    181 
    +            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.");
    182 182
    183 183 
             }
    184 184
    ... ... @@ -222,7 +222,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC
    222 222 
                     String newId = StringUtils.replace(oldId, ".longline", "");
    223 223 
                     queries.add(String.format("UPDATE observe_common.sizeMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId));
    224 224 
                     queries.add(String.format("UPDATE observe_longline.sizeMeasure SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId));
    225 
    -                queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType = '%s' WHERE sizeMeasureType = '%s'", newId, oldId));
    225 
    +                queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId));
    226 226 
                 }
    227 227 
             }
    228 228 
             {

  • 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
    30 30
    31 31 
     ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255);
    32 32 
     UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0;
    33 
    -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code ='PDL')  WHERE measureType = 1;
    34 
    -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL')  WHERE measureType = 2;
    33 
    +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;
    34 
    +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;
    35 35 
     ALTER TABLE observe_seine.targetlength DROP COLUMN measureType;
    36 
    -
    37 36 
     ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255);
    37 
    +
    38 
    +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255);
    39 
    +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid);
    40 
    +
    38 41 
     ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 VARCHAR(255);
    39 42 
     ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 VARCHAR(255);
    40 43

  • 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
    32 32
    33 33 
     ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255);
    34 34 
     UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0;
    35 
    -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code='PDL')  WHERE measureType = 1;
    36 
    -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL')  WHERE measureType = 2;
    35 
    +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;
    36 
    +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;
    37 37 
     ALTER TABLE observe_seine.targetlength DROP COLUMN measureType CASCADE;
    38 
    -
    39 38 
     ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255);
    39 
    +
    40 
    +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255);
    41 
    +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid);
    42 
    +
    40 43 
     ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 VARCHAR(255);
    41 44 
     ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 VARCHAR(255);

  • persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-common.sql
    ... ... @@ -19,9 +19,6 @@
    19 19 
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     -- #L%
    21 21 
     ---
    22 
    -ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255);
    23 
    -ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid);
    24 
    -
    25 22 
     ALTER TABLE observe_common.lengthweightparameter ADD COLUMN sizeMeasureType VARCHAR(255);
    26 23 
     ALTER TABLE observe_common.lengthweightparameter ADD CONSTRAINT FK_LENGTH_WEIGHT_PARAMETER_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid);
    27 24 
     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
    No preview for this file type
  • test/src/main/resources/db/6.902/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/6.902/referentiel.sql.gz
    No preview for this file type

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.