branch develop updated (3146d63 -> a60fe5a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 3146d63 La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus (fixes #8729) new 442fe15 mise à jour de la base de référentiel de test new e11e0ad ajout not null new c1d84b0 Correction des migrations pg new a60fe5a Correction des scripts de migration The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a60fe5ae16026ea0053b3d2e233857916e35369f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:53:05 2016 +0100 Correction des scripts de migration commit c1d84b09350ce90eac59501d0fad86b37cf20e2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:52:51 2016 +0100 Correction des migrations pg commit e11e0ad649f727133970cdc87493f9fefa2287d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:52:08 2016 +0100 ajout not null commit 442fe1571442820a77776ae6290c2f0509e8fb9e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:51:52 2016 +0100 mise à jour de la base de référentiel de test Summary of changes: .../DataSourceMigrationForVersion_5_1.java | 27 ++++------ ..._1_03_evol_6997_delete_supportVesselName-PG.sql | 2 +- .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 8 +-- .../5.1/V5_1_08_1_evol_8390_measure_type-H2.sql | 11 ++++ .../5.1/V5_1_08_1_evol_8390_measure_type-PG.sql | 11 ++++ .../5.1/V5_1_08_evol_8390_measure_type-H2.sql | 4 +- .../5.1/V5_1_08_evol_8390_measure_type-PG.sql | 10 ++-- .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 4 +- .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 58 ++++++++++----------- entities/src/main/xmi/observe.ini | 3 ++ .../topia/entity/LengthWeightParemetersTest.java | 20 +++---- .../java/fr/ird/observe/test/ObserveFixtures.java | 56 ++++++++++---------- test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 143865 -> 181714 bytes 13 files changed, 116 insertions(+), 98 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 442fe1571442820a77776ae6290c2f0509e8fb9e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:51:52 2016 +0100 mise à jour de la base de référentiel de test --- .../topia/entity/LengthWeightParemetersTest.java | 20 ++++---- .../java/fr/ird/observe/test/ObserveFixtures.java | 56 ++++++++++----------- test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 143865 -> 181714 bytes 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java index 7bbb816..13054bf 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java @@ -68,7 +68,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); @@ -149,7 +149,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("ALB").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); @@ -198,18 +198,18 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2011, date2011); assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2011, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2009); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2010, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2010); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, undeterminedSex, date2011, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2011); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2011); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010); diff --git a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java index 3e337b4..232534b 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -64,28 +64,28 @@ public class ObserveFixtures { public static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_common.country", 46L) - .put("observe_common.fpazone", 41L) + .put("observe_common.country", 72L) + .put("observe_common.fpazone", 42L) .put("observe_common.gear", 26L) .put("observe_common.gear_gearcaracteristic", 29L) .put("observe_common.gearcaracteristic", 22L) .put("observe_common.gearcaracteristictype", 6L) - .put("observe_common.harbour", 72L) + .put("observe_common.harbour", 74L) .put("observe_common.lastupdatedate", 96L) - .put("observe_common.lengthweightparameter", 352L) + .put("observe_common.lengthweightparameter", 365L) .put("observe_common.ocean", 3L) - .put("observe_common.ocean_species", 359L) - .put("observe_common.organism", 6L) - .put("observe_common.person", 344L) - .put("observe_common.program", 23L) + .put("observe_common.ocean_species", 500L) + .put("observe_common.organism", 9L) + .put("observe_common.person", 512L) + .put("observe_common.program", 27L) .put("observe_common.shipOwner", 27L) .put("observe_common.sex", 5L) - .put("observe_common.sizemeasuretype", 18L) - .put("observe_common.species", 211L) - .put("observe_common.species_specieslist", 255L) - .put("observe_common.speciesgroup", 8L) - .put("observe_common.specieslist", 5L) - .put("observe_common.vessel", 906L) + .put("observe_common.sizemeasuretype", 17L) + .put("observe_common.species", 285L) + .put("observe_common.species_specieslist", 401L) + .put("observe_common.speciesgroup", 11L) + .put("observe_common.specieslist", 6L) + .put("observe_common.vessel", 1172L) .put("observe_common.vesselsizecategory", 13L) .put("observe_common.vesseltype", 14L) .put("observe_common.weightmeasuretype", 3L) @@ -93,38 +93,38 @@ public class ObserveFixtures { public static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_seine.detectionmode", 10L) + .put("observe_seine.detectionmode", 11L) .put("observe_seine.objectfate", 9L) .put("observe_seine.objectoperation", 4L) - .put("observe_seine.objecttype", 23L) + .put("observe_seine.objecttype", 27L) .put("observe_seine.observedsystem", 21L) .put("observe_seine.reasonfordiscard", 5L) .put("observe_seine.reasonfornofishing", 13L) .put("observe_seine.reasonfornullset", 10L) - .put("observe_seine.speciesfate", 9L) - .put("observe_seine.speciesstatus", 3L) + .put("observe_seine.speciesfate", 10L) + .put("observe_seine.speciesstatus", 4L) .put("observe_seine.surroundingactivity", 8L) .put("observe_seine.transmittingbuoyoperation", 3L) .put("observe_seine.transmittingbuoytype", 12L) .put("observe_seine.vesselactivity", 23L) - .put("observe_seine.weightcategory", 101L) + .put("observe_seine.weightcategory", 110L) .put("observe_seine.wind", 13L) .build(); public static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap .<String, Long>builder() - .put("observe_longline.baithaulingstatus", 4L) - .put("observe_longline.baitsettingstatus", 4L) - .put("observe_longline.baittype", 10L) - .put("observe_longline.catchfate", 6L) + .put("observe_longline.baithaulingstatus", 5L) + .put("observe_longline.baitsettingstatus", 5L) + .put("observe_longline.baittype", 16L) + .put("observe_longline.catchfate", 5L) .put("observe_longline.encountertype", 12L) .put("observe_longline.healthness", 6L) .put("observe_longline.hookposition", 13L) - .put("observe_longline.hooksize", 21L) - .put("observe_longline.hooktype", 12L) + .put("observe_longline.hooksize", 22L) + .put("observe_longline.hooktype", 13L) .put("observe_longline.itemverticalposition", 3L) .put("observe_longline.itemhorizontalposition", 3L) - .put("observe_longline.lightstickscolor", 6L) + .put("observe_longline.lightstickscolor", 7L) .put("observe_longline.lightstickstype", 2L) .put("observe_longline.linetype", 8L) .put("observe_longline.maturitystatus", 12L) @@ -132,8 +132,8 @@ public class ObserveFixtures { .put("observe_longline.sensorbrand", 4L) .put("observe_longline.sensordataformat", 2L) .put("observe_longline.sensortype", 4L) - .put("observe_longline.settingshape", 5L) - .put("observe_longline.stomacfullness", 6L) + .put("observe_longline.settingshape", 6L) + .put("observe_longline.stomacfullness", 7L) .put("observe_longline.triptype", 3L) .put("observe_longline.vesselactivity", 5L) .build(); diff --git a/test/src/main/resources/db/5.1/referentiel.sql.gz b/test/src/main/resources/db/5.1/referentiel.sql.gz index 72a4111..65c8038 100644 Binary files a/test/src/main/resources/db/5.1/referentiel.sql.gz and b/test/src/main/resources/db/5.1/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e11e0ad649f727133970cdc87493f9fefa2287d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:52:08 2016 +0100 ajout not null --- entities/src/main/xmi/observe.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/entities/src/main/xmi/observe.ini b/entities/src/main/xmi/observe.ini index dba0745..f1ca6ad 100644 --- a/entities/src/main/xmi/observe.ini +++ b/entities/src/main/xmi/observe.ini @@ -161,6 +161,9 @@ source.hibernateAttributeType = text species.lazy = false species.notNull = true +[class fr.ird.observe.entities.referentiel.ObserveReferentialEntity] +needComment.notNull = true + [class fr.ird.observe.entities.referentiel.Organism] country.lazy = false -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 c1d84b09350ce90eac59501d0fad86b37cf20e2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 16:52:51 2016 +0100 Correction des migrations pg --- ..._1_03_evol_6997_delete_supportVesselName-PG.sql | 2 +- .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 8 +-- .../5.1/V5_1_08_1_evol_8390_measure_type-PG.sql | 11 ++++ .../5.1/V5_1_08_evol_8390_measure_type-PG.sql | 10 ++-- .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 58 +++++++++++----------- 5 files changed, 50 insertions(+), 39 deletions(-) diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql index fc7374f..e344734 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql @@ -1 +1 @@ -ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName; \ No newline at end of file +ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName CASCADE; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql index dfb007e..d315ff7 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql @@ -1,4 +1,4 @@ -ALTER TABLE observe_seine.nontargetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; -ALTER TABLE observe_seine.nontargetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; -ALTER TABLE observe_seine.targetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; -ALTER TABLE observe_seine.targetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; \ No newline at end of file +ALTER TABLE observe_seine.nontargetlength RENAME COLUMN lengthSource TO isLengthComputed; +ALTER TABLE observe_seine.nontargetlength RENAME COLUMN weightSource TO isWeightComputed; +ALTER TABLE observe_seine.targetlength RENAME COLUMN lengthSource TO isLengthComputed; +ALTER TABLE observe_seine.targetlength RENAME COLUMN weightSource TO isWeightComputed; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql new file mode 100644 index 0000000..6497b96 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql @@ -0,0 +1,11 @@ +ALTER TABLE observe_seine.targetLength DROP COLUMN sizeMeasureType CASCADE; +ALTER TABLE observe_seine.targetLength RENAME COLUMN sizeMeasureType2 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 CASCADE; +ALTER TABLE observe_longline.sizeMeasure RENAME COLUMN sizeMeasureType2 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 CASCADE; +ALTER TABLE observe_longline.weightMeasure RENAME COLUMN weightMeasureType2 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-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql index fa33d6f..d92f195 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql @@ -1,10 +1,10 @@ -CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character var [...] +CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character [...] ALTER TABLE observe_common.SIZEMEASURETYPE ADD CONSTRAINT PK_SIZEMEASURETYPE PRIMARY KEY(TOPIAID); -INSERT INTO observe_common.SIZEMEASURETYPE(topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.SIZEMEASURETYPE); +INSERT INTO observe_common.SIZEMEASURETYPE(topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.SIZEMEASURETYPE); -CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character v [...] +CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 charact [...] ALTER TABLE observe_common.WEIGHTMEASURETYPE ADD CONSTRAINT PK_WEIGHTMEASURETYPE PRIMARY KEY(TOPIAID); -INSERT INTO observe_common.WEIGHTMEASURETYPE( topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.WEIGHTMEASURETYPE); +INSERT INTO observe_common.WEIGHTMEASURETYPE( topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.WEIGHTMEASURETYPE); UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.SizeMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType'; UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.WeightMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType'; @@ -13,7 +13,7 @@ ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType character vary UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where label1 ='PDL') WHERE measureType = 1; UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where label1='FL') WHERE measureType = 2; -ALTER TABLE observe_seine.targetlength DROP COLUMN measureType; +ALTER TABLE observe_seine.targetlength DROP COLUMN measureType CASCADE; ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 character varying(255); ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 character varying(255); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql index cdded22..101a7c8 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql @@ -1,35 +1,35 @@ -CREATE TABLE observe_common.shipOwner( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri character varying(255), label character varying(255), country character varying(255), startDate DATE, endDate DATE); +CREATE TABLE observe_common.shipOwner( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri character varying(255), label character varying(255), country character varying(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); +CREATE INDEX INDEX_OBSERVE_COMMON_SHIP_OWNER_COUNTRY ON observe_common.shipOwner(country); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '1','SAUPIQUET', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '2','SAPMER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '3','CFTO', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '4','IOSMS', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '5','TFC', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '6','ACF', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '7','CMB', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '8','PECHE ET FROID', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '9','IAT', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '10','LE BOUTER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '11','ACF/CMB', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '12','COBRECAF', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '13','CHARLOT', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '14','HARTSWATER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '15','PEVASA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '16','ECHEBASTAR', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '17','ISABELLA FISHING', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '18','ATUNSA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '19','ALBACORA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '20','DONWONG', 'fr.ird.observe.entities.referentiel.Country#1239832675585#0.7535948739996284'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '21','ENEZ DU', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '22','MINATCHY', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '23','PECHE AVENIR', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '24','INPESCA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '25','CALVO', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '26','NICRA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); -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, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '1','SAUPIQUET', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '2','SAPMER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '3','CFTO', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '4','IOSMS', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '5','TFC', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '6','ACF', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '7','CMB', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '8','PECHE ET FROID', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '9','IAT', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '10','LE BOUTER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '11','ACF/CMB', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '12','COBRECAF', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '13','CHARLOT', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '14','HARTSWATER', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '15','PEVASA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '16','ECHEBASTAR', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '17','ISABELLA FISHING', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '18','ATUNSA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '19','ALBACORA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '20','DONWONG', 'fr.ird.observe.entities.referentiel.Country#1239832675585#0.7535948739996284'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '21','ENEZ DU', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '22','MINATCHY', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '23','PECHE AVENIR', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) 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'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) 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'); +INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) 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'); +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>.
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>.
participants (1)
-
codelutin.com scm