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

Commits:

9 changed files:

Changes:

  • CHANGELOG.md
    1 1
     # ObServe changelog
    
    2 2
     
    
    3 3
      * Author [Tony Chemit](mailto:dev@tchemit.fr)
    
    4
    - * Last generated at 2020-05-23 14:08.
    
    4
    + * Last generated at 2020-05-26 11:54.
    
    5 5
     
    
    6 6
     ## Version [8.0-RC-7](https://gitlab.com/ultreiaio/ird-observe/milestones/161)
    
    7 7
     
    
    ... ... @@ -236,6 +236,14 @@
    236 236
       * [[Evolution 1181]](https://gitlab.com/ultreiaio/ird-observe/issues/1181) **Ajouter un champ vessel.lloydid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    
    237 237
       * [[Evolution 1183]](https://gitlab.com/ultreiaio/ird-observe/issues/1183) **[V8][DATA MODEL] Transformer Vessel.fleetcountry (int4) en topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    
    238 238
     
    
    239
    +## Version [7.6.2](https://gitlab.com/ultreiaio/ird-observe/milestones/164)
    
    240
    +
    
    241
    +**Closed at 2020-05-26.**
    
    242
    +
    
    243
    +
    
    244
    +### Issues
    
    245
    +  * [[Anomalie 1492]](https://gitlab.com/ultreiaio/ird-observe/issues/1492) **Migration des trip.comment vers trip.homeid incorrecte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    
    246
    +
    
    239 247
     ## Version [7.6.1](https://gitlab.com/ultreiaio/ird-observe/milestones/163)
    
    240 248
     
    
    241 249
     **Closed at 2020-05-23.**
    

  • persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_6.java
    ... ... @@ -72,7 +72,7 @@ public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource
    72 72
                     // Must be a ## starting comment
    
    73 73
                     continue;
    
    74 74
                 }
    
    75
    -            String homeId = comment.substring(1, endIndex - 1);
    
    75
    +            String homeId = comment.substring(1, endIndex);
    
    76 76
                 String newComment = endIndex + 1 == comment.length() ? "NULL" : (String.format("'%s'", comment.substring(endIndex + 1).trim().replaceAll("'","''")));
    
    77 77
                 executor.writeSql(String.format("UPDATE observe_seine.trip t SET comment = %s, homeId = '%s', topiaVersion = topiaVersion + 1, lastUpdateDate = CURRENT_TIMESTAMP WHERE t.topiaId = '%s';", newComment, homeId, tripId));
    
    78 78
             }
    

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>io.ultreia.maven</groupId>
    
    26 26
         <artifactId>pom</artifactId>
    
    27
    -    <version>2020.27</version>
    
    27
    +    <version>2020.28</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -176,7 +176,7 @@
    176 176
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
    
    177 177
         <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
    
    178 178
         <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
    
    179
    -    <lib.version.java4all.topia>1.22</lib.version.java4all.topia>
    
    179
    +<!--    <lib.version.java4all.topia>1.22</lib.version.java4all.topia>-->
    
    180 180
         <!--<lib.version.java4all.http>1.0.17-SNAPSHOT</lib.version.java4all.http>-->
    
    181 181
     
    
    182 182
         <!-- license header configuration -->
    

  • test/src/main/resources/db/7.6/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.6/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.6/referentiel.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.0/referentiel.sql.gz
    No preview for this file type