[T3-commits] [Git][ultreiaio/ird-t3][develop] 2 commits: Internationalisation des tables (Closes #294)

19 Mar 2018

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


Commits:
1c4fdd94 by Tony CHEMIT at 2018-03-19T11:48:46Z
Internationalisation des tables (Closes #294)

- - - - -
047eab38 by Tony CHEMIT at 2018-03-19T11:49:21Z
use last pom

- - - - -


10 changed files:

- pom.xml
- t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java
- + t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql
- t3-domain/src/main/xmi/t3-persistence.zargo
- t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql
- t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql
- t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql
- t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java
- t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java
- t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java


Changes:

=====================================
pom.xml
=====================================

--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2018.24</version>
+    <version>2018.25</version>
   </parent>
 
   <groupId>fr.ird.t3</groupId>
@@ -99,7 +99,7 @@
     <projectId>ird-t3</projectId>
     <stageId>frirdt3</stageId>
     <applicationName>t3</applicationName>
-    <t3-data.version>1.4</t3-data.version>
+    <t3-data.version>1.5-SNAPSHOT</t3-data.version>
 
     <env>dev</env>
     <skipITs>true</skipITs>


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


=====================================
t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql
=====================================
--- /dev/null
+++ b/t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql
@@ -0,0 +1,32 @@
+---
+-- #%L
+-- T3 :: Domain
+-- %%
+-- Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io
+-- %%
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-- #L%
+---
+ALTER TABLE schooltype RENAME libelle4 TO homeId;
+ALTER TABLE vesselsizecategory RENAME gaugelibelle TO homeId;
+ALTER TABLE vesselsizecategory RENAME capacitylibelle TO label1;
+ALTER TABLE vesselsizecategory ADD COLUMN label2 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label3 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label4 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label5 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label6 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label7 VARCHAR(255);
+ALTER TABLE vesselsizecategory ADD COLUMN label8 VARCHAR(255);
+ALTER TABLE vessel ADD COLUMN iotcId VARCHAR(255);
+ALTER TABLE vessel ADD COLUMN iccatId VARCHAR(255);


=====================================
t3-domain/src/main/xmi/t3-persistence.zargo
=====================================
Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ


=====================================
t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql
=====================================
--- a/t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql
+++ b/t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql
@@ -94,7 +94,7 @@ INSERT INTO PUBLIC.SPECIES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, CODE3L,
 UPDATE PUBLIC.SPECIES SET status = TRUE;
 
 -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
-INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
+INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
 ('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
=====================================
--- a/t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql
+++ b/t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql
@@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V
 UPDATE PUBLIC.ocean SET status = TRUE;
 
 -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
-INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
+INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
 ('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
=====================================
--- a/t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql
+++ b/t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql
@@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V
 UPDATE PUBLIC.ocean SET status = TRUE;
 
 -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE;
-INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES
+INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500),
 ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000),
 ('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
=====================================
--- a/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java
+++ b/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java
@@ -297,8 +297,8 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv
                 "CAT_BATEAU",
                 new String[]{"C_CAT_B"},
                 VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
-                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
-                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
+                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
+                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
         );
 
         // 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
                 new String[]{"C_TBANC"},
                 SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
                 SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
-                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
+                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
         );
 
         // OCEAN : [C_OCEA, L_OCEA]


=====================================
t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java
=====================================
--- a/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java
+++ b/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java
@@ -409,8 +409,8 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv
                 "CAT_BATEAU",
                 new String[]{"C_CAT_B"},
                 VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
-                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
-                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
+                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
+                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
         );
 
         // 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
                 new String[]{"C_TBANC"},
                 SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
                 SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
-                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
+                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
         );
 
         // OCEAN : [C_OCEA, L_OCEA]


=====================================
t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java
=====================================
--- a/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java
+++ b/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java
@@ -412,8 +412,8 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv
                 "CAT_BATEAU",
                 new String[]{"C_CAT_B"},
                 VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B",
-                VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC",
-                VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE"
+                VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC",
+                VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE"
         );
 
         // 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
                 new String[]{"C_TBANC"},
                 SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC",
                 SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC",
-                SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L"
+                SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L"
         );
 
         // OCEAN : [C_OCEA, L_OCEA]



View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f29b7d5de44fea51e8602b828d7d0b83...

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f29b7d5de44fea51e8602b828d7d0b83...
You're receiving this email because of your account on gitlab.com.

    