[Observe-commits] 04/04: Correction des scripts de migration

4 Nov 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit a60fe5ae16026ea0053b3d2e233857916e35369f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Nov 4 16:53:05 2016 +0100

    Correction des scripts de migration
---
 .../DataSourceMigrationForVersion_5_1.java         | 27 ++++++++--------------
 .../5.1/V5_1_08_1_evol_8390_measure_type-H2.sql    | 11 +++++++++
 .../5.1/V5_1_08_evol_8390_measure_type-H2.sql      |  4 ++--
 .../V5_1_13_evol_7901_add_armateur_table-H2.sql    |  4 ++--
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java
index f55cba7..80f4acb 100644
--- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java
+++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java
@@ -45,11 +45,15 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
         addScript("05", "evol_6999_nonTargetCatch_add_well", queries);
         addScript("06", "evol_8375_setSeine_add_booleans", queries);
         addScript("07", "evol_8389_rename_source_columns", queries);
+
         addScript("08", "evol_8390_measure_type", queries);
+        evol8390(topiaSqlSupport, queries);
+        addScript("08_1", "evol_8390_measure_type", queries);
+
         addScript("09", "evol_7877_targetLength_add_sex", queries);
-        evol7877(topiaSqlSupport, queries);
         addScript("10", "evol_8391_species_add_sizeMeasureType", queries);
         evol8391(topiaSqlSupport, queries);
+
         addScript("11", "evol_8571_length_add_tagNumber", queries);
         addScript("12", "evol_8475_vessel_add_fields", queries);
         addScript("13", "evol_7901_add_armateur_table", queries);
@@ -62,7 +66,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
 
         ImmutableMap<String, String> missingCodesMapping = ImmutableMap.<String, String>builder()
                 .put("LT ?", "TL")
-                .put("FL", "LF")
+                .put("LF", "FL")
                 .put("L1", "PDL")
                 .put("LC", "DL")
                 .put("LT", "TL")
@@ -96,7 +100,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
 
                 @Override
                 public PreparedStatement prepareQuery(Connection connection) throws SQLException {
-                    return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE label1 = '" + finalLengthMeasureType + "'");
+                    return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'");
                 }
 
                 @Override
@@ -112,7 +116,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
 
                     @Override
                     public PreparedStatement prepareQuery(Connection connection) throws SQLException {
-                        return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE label1 = 'TL'");
+                        return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE code = 'TL'");
                     }
 
                     @Override
@@ -138,11 +142,11 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
             throw new IllegalStateException("Impossible de trouver la type de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(invalidCodes));
         }
 
-        queries.add("ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype;");
+        queries.add("ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype CASCADE;");
 
     }
 
-    private void evol7877(TopiaSqlSupport topiaSqlSupport, List<String> queries) {
+    private void evol8390(TopiaSqlSupport topiaSqlSupport, List<String> queries) {
         {
             List<String> oldIds = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() {
 
@@ -185,17 +189,6 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC
             }
         }
 
-        queries.add("ALTER TABLE observe_seine.targetLength DROP COLUMN sizeMeasureType");
-        queries.add("ALTER TABLE observe_seine.targetLength ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType");
-        queries.add("ALTER TABLE observe_seine.targetlength ADD CONSTRAINT fk_targetLength_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);");
-
-        queries.add("ALTER TABLE observe_longline.sizeMeasure DROP COLUMN sizeMeasureType");
-        queries.add("ALTER TABLE observe_longline.sizeMeasure ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType");
-        queries.add("ALTER TABLE observe_longline.sizeMeasure ADD CONSTRAINT fk_sizeMeasure_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);");
-
-        queries.add("ALTER TABLE observe_longline.weightMeasure DROP COLUMN weightMeasureType");
-        queries.add("ALTER TABLE observe_longline.weightMeasure ALTER COLUMN weightMeasureType2 RENAME  TO weightMeasureType");
-        queries.add("ALTER TABLE observe_longline.weightMeasure ADD CONSTRAINT fk_weightMeasure_weightMeasureType FOREIGN KEY(weightMeasureType) REFERENCES observe_common.weightMeasureType(topiaId);");
     }
 
     public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 {
diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql
new file mode 100644
index 0000000..0457134
--- /dev/null
+++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql
@@ -0,0 +1,11 @@
+ALTER TABLE observe_seine.targetLength DROP COLUMN sizeMeasureType;
+ALTER TABLE observe_seine.targetLength ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType;
+ALTER TABLE observe_seine.targetlength ADD CONSTRAINT fk_targetLength_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);
+ALTER TABLE observe_longline.sizeMeasure DROP COLUMN sizeMeasureType;
+
+ALTER TABLE observe_longline.sizeMeasure ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType;
+ALTER TABLE observe_longline.sizeMeasure ADD CONSTRAINT fk_sizeMeasure_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);
+
+ALTER TABLE observe_longline.weightMeasure DROP COLUMN weightMeasureType;
+ALTER TABLE observe_longline.weightMeasure ALTER COLUMN weightMeasureType2 RENAME  TO weightMeasureType;
+ALTER TABLE observe_longline.weightMeasure ADD CONSTRAINT fk_weightMeasure_weightMeasureType FOREIGN KEY(weightMeasureType) REFERENCES observe_common.weightMeasureType(topiaId);
\ No newline at end of file
diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql
index f7987d6..d4ec14b 100644
--- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql
+++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql
@@ -1,7 +1,7 @@
-CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status [...]
+CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate [...]
 ALTER TABLE observe_common.SIZEMEASURETYPE ADD CONSTRAINT PK_SIZEMEASURETYPE PRIMARY KEY(TOPIAID);
 
-CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, stat [...]
+CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdateda [...]
 ALTER TABLE observe_common.WEIGHTMEASURETYPE ADD CONSTRAINT PK_WEIGHTMEASURETYPE PRIMARY KEY(TOPIAID);
 
 UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.SizeMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType';
diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql
index 38ba7c2..15fcb7a 100644
--- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql
+++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql
@@ -1,4 +1,4 @@
-CREATE TABLE observe_common.shipOwner( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri VARCHAR(255), label VARCHAR(255), country VARCHAR(255), startDate DATE, endDate DATE);
+CREATE TABLE observe_common.shipOwner( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label VARCHAR(255), country VARCHAR(255), startDate DATE, endDate DATE);
 ALTER TABLE observe_common.shipOwner ADD CONSTRAINT PK_SHIP_OWNER PRIMARY KEY(topiaid);
 ALTER TABLE observe_common.shipOwner ADD CONSTRAINT FK_SHIP_OWNER_COUNTRY FOREIGN KEY(country) REFERENCES observe_common.country(topiaid);
 CREATE INDEX observe_common.INDEX_OBSERVE_COMMON_SHIP_OWNER_COUNTRY ON observe_common.shipOwner(country);
@@ -29,7 +29,7 @@ INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, la
 INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '24','INPESCA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325', false);
 INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1 , '25','CALVO', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325', false);
 INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '26','NICRA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325', false);
-INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '999','UND', true);
+INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '999','UND', true);
 
 INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#1', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.ShipOwner', CURRENT_TIMESTAMP);
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 04/04: Correction des scripts de migration

codelutin.com scm