Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4a856a8b by Tony Chemit at 2020-12-30T11:22:13+01:00 Peaufinage de la table common.program - Closes #1712 - - - - - 7 changed files: - models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql ===================================== @@ -110,6 +110,8 @@ INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.referential.common.Person#666#24' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Savy', 'Vincent', 'fr.ird.referential.common.Country#1239832675593#0.3601938043845213'); INSERT INTO common.Person(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.referential.common.Person#666#25' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Perikanan', 'Pengawas', 'fr.ird.referential.common.Country#1239832675593#0.3601938043845213'); +INSERT INTO common.program(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, organism, nontargetobservation, targetdiscardsobservation, samplesobservation, objectsobservation, detailedactivitiesobservation, mammalsobservation, birdsobservation, baitobservation, startdate, enddate, comment, geartype) VALUES ('fr.ird.referential.common.Program#1609292987444#0.2779633795557708', 1, '2020-12-30 01:41:23.965', '2020-12-30 01:49:47.515', '50', null, null, FALSE, 1, 'FINSS', 'FINSS', 'FINSS', null, null, null, null, null, 'fr.ird.referential.common.Organism#1267835067241#0.06632537553306939', 1, 1, 1, 0, 0, 0, 0, 0, '2020-05-17 00:00:00', '2021-12-31 00:00:00', null, 1); + UPDATE common.Wind SET LABEL2='Calme (Calme)', LABEL1='Calm', LABEL3='Calma (Despejado)' WHERE CODE='0'; UPDATE common.Wind SET LABEL2='Très légère brise (Calme, ridée)', LABEL1='Light air',LABEL3='Ventolina (Pequeñas olas, pero sin espuma)' WHERE CODE='1'; UPDATE common.Wind SET LABEL2='Légère brise (Belle, vaguelettes)', LABEL1='Light breeze', LABEL3='Flojito (Crestas de apariencia vítrea, sin romper)' WHERE CODE='2'; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties ===================================== @@ -36,7 +36,7 @@ common.ocean=3 common.ocean_species=500 common.organism=9 common.person=537 -common.program=27 +common.program=28 common.shipowner=27 common.sex=5 common.sizemeasuretype=16 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -32,7 +32,7 @@ fr.ird.observe.entities.referential.common.LengthWeightParameter=361 fr.ird.observe.entities.referential.common.Ocean=3 fr.ird.observe.entities.referential.common.Organism=9 fr.ird.observe.entities.referential.common.Person=537 -fr.ird.observe.entities.referential.common.Program=27 +fr.ird.observe.entities.referential.common.Program=28 fr.ird.observe.entities.referential.common.Sex=5 fr.ird.observe.entities.referential.common.ShipOwner=27 fr.ird.observe.entities.referential.common.SizeMeasureType=16 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=52 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3030 +REFERENTIAL_COUNT=3031 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a856a8bf5393c39badea40bb0... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4a856a8bf5393c39badea40bb0... You're receiving this email because of your account on gitlab.com.