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

Commits:

10 changed files:

Changes:

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2018.24</version>
    26 
    +    <version>2018.25</version>
    27 27 
       </parent>
    28 28
    29 29 
       <groupId>fr.ird.t3</groupId>
    ... ... @@ -99,7 +99,7 @@
    99 99 
         <projectId>ird-t3</projectId>
    100 100 
         <stageId>frirdt3</stageId>
    101 101 
         <applicationName>t3</applicationName>
    102 
    -    <t3-data.version>1.4</t3-data.version>
    102 
    +    <t3-data.version>1.5-SNAPSHOT</t3-data.version>
    103 103
    104 104 
         <env>dev</env>
    105 105 
         <skipITs>true</skipITs>

  • t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java
    ... ... @@ -45,6 +45,7 @@ public class T3MigrationCallbackV2_4 extends T3MigrationCallbackSupport {
    45 45 
         protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException {
    46 46 
             addScript("01", "delete_idx", queries);
    47 47 
             addScript("02", "spatialize-harbour", queries);
    48 
    +        addScript("03", "review-referential", queries);
    48 49 
         }
    49 50
    50 51 
     }

  • t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- T3 :: Domain
    4 
    +-- %%
    5 
    +-- Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU Affero General Public License as published by
    9 
    +-- the Free Software Foundation, either version 3 of the License, or
    10 
    +-- (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU Affero General Public License
    18 
    +-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19 
    +-- #L%
    20 
    +---
    21 
    +ALTER TABLE schooltype RENAME libelle4 TO homeId;
    22 
    +ALTER TABLE vesselsizecategory RENAME gaugelibelle TO homeId;
    23 
    +ALTER TABLE vesselsizecategory RENAME capacitylibelle TO label1;
    24 
    +ALTER TABLE vesselsizecategory ADD COLUMN label2 VARCHAR(255);
    25 
    +ALTER TABLE vesselsizecategory ADD COLUMN label3 VARCHAR(255);
    26 
    +ALTER TABLE vesselsizecategory ADD COLUMN label4 VARCHAR(255);
    27 
    +ALTER TABLE vesselsizecategory ADD COLUMN label5 VARCHAR(255);
    28 
    +ALTER TABLE vesselsizecategory ADD COLUMN label6 VARCHAR(255);
    29 
    +ALTER TABLE vesselsizecategory ADD COLUMN label7 VARCHAR(255);
    30 
    +ALTER TABLE vesselsizecategory ADD COLUMN label8 VARCHAR(255);
    31 
    +ALTER TABLE vessel ADD COLUMN iotcId VARCHAR(255);
    32 
    +ALTER TABLE vessel ADD COLUMN iccatId VARCHAR(255);

  • t3-domain/src/main/xmi/t3-persistence.zargo
    No preview for this file type
  • t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql
    ... ... @@ -94,7 +94,7 @@ INSERT INTO PUBLIC.SPECIES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, CODE3L,
    94 94 
     UPDATE PUBLIC.SPECIES SET status = TRUE;
    95 95
    96 96 
     -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
    97 
    -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
    97 
    +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
    98 98 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
    99 99 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
    100 100 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL);

  • t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql
    ... ... @@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V
    28 28 
     UPDATE PUBLIC.ocean SET status = TRUE;
    29 29
    30 30 
     -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
    31 
    -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
    31 
    +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
    32 32 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
    33 33 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
    34 34 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL);

  • t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql
    ... ... @@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V
    28 28 
     UPDATE PUBLIC.ocean SET status = TRUE;
    29 29
    30 30 
     -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
    31 
    -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
    31 
    +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
    32 32 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
    33 33 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
    34 34 
     ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL);

  • t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java
    ... ... @@ -297,8 +297,8 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv
    297 297 
                     "CAT_BATEAU",
    298 298 
                     new String[]{"C_CAT_B"},
    299 299 
                     VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
    300 
    -                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
    301 
    -                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
    300 
    +                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
    301 
    +                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
    302 302 
             );
    303 303
    304 304 
             // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV]
    ... ... @@ -375,7 +375,7 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv
    375 375 
                     new String[]{"C_TBANC"},
    376 376 
                     SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
    377 377 
                     SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
    378 
    -                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
    378 
    +                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
    379 379 
             );
    380 380
    381 381 
             // OCEAN : [C_OCEA, L_OCEA]

  • t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java
    ... ... @@ -409,8 +409,8 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv
    409 409 
                     "CAT_BATEAU",
    410 410 
                     new String[]{"C_CAT_B"},
    411 411 
                     VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
    412 
    -                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
    413 
    -                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
    412 
    +                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
    413 
    +                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
    414 414 
             );
    415 415
    416 416 
             // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV]
    ... ... @@ -493,7 +493,7 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv
    493 493 
                     new String[]{"C_TBANC"},
    494 494 
                     SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
    495 495 
                     SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
    496 
    -                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
    496 
    +                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
    497 497 
             );
    498 498
    499 499 
             // OCEAN : [C_OCEA, L_OCEA]

  • t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java
    ... ... @@ -412,8 +412,8 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv
    412 412 
                     "CAT_BATEAU",
    413 413 
                     new String[]{"C_CAT_B"},
    414 414 
                     VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
    415 
    -                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
    416 
    -                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
    415 
    +                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
    416 
    +                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
    417 417 
             );
    418 418
    419 419 
             // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV]
    ... ... @@ -497,7 +497,7 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv
    497 497 
                     new String[]{"C_TBANC"},
    498 498 
                     SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
    499 499 
                     SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
    500 
    -                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
    500 
    +                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
    501 501 
             );
    502 502
    503 503 
             // OCEAN : [C_OCEA, L_OCEA]

    • —
    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.