Tony CHEMIT pushed to branch feature/873 at ultreiaio / ird-observe Commits: af24ebd8 by Tony CHEMIT at 2017-09-12T20:41:10+00:00 fix typo - - - - - 3d8a84e6 by Tony CHEMIT at 2017-09-13T10:54:46+00:00 Revert lost commit, somewhere in 7.0-RC-8 - - - - - e788343e by Tony CHEMIT at 2017-09-13T10:55:11+00:00 Renommage de certaines tables du modèle palangre en les suffixant par Obs (see #873) (migration et adaptations) - - - - - 22 changed files: - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUIHandler.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineObsTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_7.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java - persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java - persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - + persistence/src/main/resources/db/migration/6.904/01_rename_longline_obs-H2.sql - pom.xml - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - + test/src/main/resources/db/6.904/dataForTestLongline.sql.gz - + test/src/main/resources/db/6.904/dataForTestSeine.sql.gz - + test/src/main/resources/db/6.904/empty_h2.sql.gz - + test/src/main/resources/db/6.904/empty_pg.sql.gz - + test/src/main/resources/db/6.904/referentiel.sql.gz Changes: ===================================== client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql ===================================== --- a/client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql +++ b/client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql @@ -21,6 +21,6 @@ --- SELECT AddGeometryColumn('observe_longline','activity', 'the_geom', 4326, 'POINT',2 ); -UPDATE observe_longline.activity SET the_geom=ST_SetSRID(ST_MakePoint(longitude,latitude), 4326); -DROP TRIGGER IF EXISTS tr_sync_longline_activity_the_geom ON observe_longline.activity; -CREATE TRIGGER tr_sync_longline_activity_the_geom BEFORE insert or update ON observe_longline.activity FOR EACH ROW EXECUTE PROCEDURE sync_activity_the_geom(); +UPDATE observe_longline.activityobs SET the_geom=ST_SetSRID(ST_MakePoint(longitude,latitude), 4326); +DROP TRIGGER IF EXISTS tr_sync_longline_activity_the_geom ON observe_longline.activityobs; +CREATE TRIGGER tr_sync_longline_activity_the_geom BEFORE insert or update ON observe_longline.activityobs FOR EACH ROW EXECUTE PROCEDURE sync_activity_the_geom(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUIHandler.java @@ -26,10 +26,10 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.client.ui.util.UIHelper; -import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.ActivityLonglineObsEncounterDto; import fr.ird.observe.dto.data.longline.ActivityLonglineObsEncounterHelper; import fr.ird.observe.dto.data.longline.EncounterDto; +import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.SpeciesListDto; @@ -87,8 +87,8 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineOb JTable table = getUi().getTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.common.EncounterDto.table.encouterType"), - n("observe.common.EncounterDto.table.encouterType.tip"), + n("observe.common.EncounterDto.table.encounterType"), + n("observe.common.EncounterDto.table.encounterType.tip"), n("observe.common.EncounterDto.table.species"), n("observe.common.EncounterDto.table.species.tip"), n("observe.common.EncounterDto.table.distance"), ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -524,8 +524,8 @@ observe.common.EncounterDto.table.count=Count observe.common.EncounterDto.table.count.tip=Count observe.common.EncounterDto.table.distance=Distance (m) observe.common.EncounterDto.table.distance.tip=Distance (m) -observe.common.EncounterDto.table.encouterType=Type -observe.common.EncounterDto.table.encouterType.tip=Type +observe.common.EncounterDto.table.encounterType=Type +observe.common.EncounterDto.table.encounterType.tip=Type observe.common.EncounterDto.table.species=Species observe.common.EncounterDto.table.species.tip=Species observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -524,8 +524,8 @@ observe.common.EncounterDto.table.count=Numéro observe.common.EncounterDto.table.count.tip=Numéro observe.common.EncounterDto.table.distance=Distancia (m) observe.common.EncounterDto.table.distance.tip=Distancia (m) -observe.common.EncounterDto.table.encouterType=Tipo -observe.common.EncounterDto.table.encouterType.tip=Tipo del encuentro +observe.common.EncounterDto.table.encounterType=Tipo +observe.common.EncounterDto.table.encounterType.tip=Tipo del encuentro observe.common.EncounterDto.table.species=Especie observe.common.EncounterDto.table.species.tip=Especie encuentrada observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable \#TODO ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -524,8 +524,8 @@ observe.common.EncounterDto.table.count=Nombre observe.common.EncounterDto.table.count.tip=Nombre observe.common.EncounterDto.table.distance=Distance (m) observe.common.EncounterDto.table.distance.tip=Distance (m) -observe.common.EncounterDto.table.encouterType=Type -observe.common.EncounterDto.table.encouterType.tip=Type de la rencontre +observe.common.EncounterDto.table.encounterType=Type +observe.common.EncounterDto.table.encounterType.tip=Type de la rencontre observe.common.EncounterDto.table.species=Espèce observe.common.EncounterDto.table.species.tip=Espèce rencontrée observe.common.FloatingObjectDto.computedBiodegradable=Biodégradable ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineObsTopiaDao.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineObsTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineObsTopiaDao.java @@ -57,7 +57,7 @@ public class ActivityLonglineObsTopiaDao extends AbstractActivityLonglineObsTopi " a.set," + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.activity a, observe_longline.vesselactivity va" + + " FROM observe_longline.activityobs a, observe_longline.vesselactivity va" + " WHERE " + " a.trip = ?" + " AND a.vesselactivity = va.topiaid" + @@ -76,7 +76,7 @@ public class ActivityLonglineObsTopiaDao extends AbstractActivityLonglineObsTopi " a.set," + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.activity a, observe_longline.vesselactivity va" + + " FROM observe_longline.activityobs a, observe_longline.vesselactivity va" + " WHERE " + " a.topiaId = ?" + " AND a.vesselactivity = va.topiaid" + ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -121,8 +121,8 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " s.haulingEndTimestamp," + " s.haulingEndLatitude," + " s.haulingEndLongitude" + - " FROM observe_longLine.activity a" + - " LEFT OUTER JOIN observe_longLine.set s" + + " FROM observe_longLine.activityobs a" + + " LEFT OUTER JOIN observe_longLine.setobs s" + " ON s.topiaId = a.set" + " WHERE a.trip = ?" + " ORDER BY a.timestamp"; @@ -271,7 +271,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public static Timestamp find(TopiaSqlSupport context, String tripId) { String sql = "SELECT max(a.timestamp)" + - " FROM observe_longline.activity a" + + " FROM observe_longline.activityobs a" + " WHERE a.trip = ?"; TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); ===================================== persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java @@ -323,8 +323,8 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat basketTable.getTableName(), basketTable.getFromClause(), basketTable.getWhereClauseAlias(), - ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", - " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId" + ImmutableSet.of(" INNER JOIN observe_longline.setObs setObs ON setObs.topiaId = activityObs.setObs", + " INNER JOIN observe_longline.basket basket ON basket.setObs= setObs.topiaId" ), null); @@ -339,8 +339,8 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat branchlineTable.getTableName(), branchlineTable.getFromClause(), branchlineTable.getWhereClauseAlias(), - ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", - " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId", + ImmutableSet.of(" INNER JOIN observe_longline.setObs setObs ON setObs.topiaId = activityObs.setObs", + " INNER JOIN observe_longline.basket basket ON basket.setObs = setObs.topiaId", " INNER JOIN observe_longline.branchline branchline ON branchline.basket = basket.topiaId" ), null); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_7.java ===================================== --- /dev/null +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_7.java @@ -0,0 +1,64 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.List; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +/** + * Created on 27/10/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +@MigrationVersion(version = "6.903") +public class DataSourceMigrationForVersion_7_0_RC_7 extends AbstractObserveMigrationCallBack { + + DataSourceMigrationForVersion_7_0_RC_7(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_7_0_RC_7.class, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + addScript("01", "fill_non_target_sample_size_measure_type", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0_RC_7 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0_RC_7 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} + ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java ===================================== --- /dev/null +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java @@ -0,0 +1,76 @@ +package fr.ird.observe.persistence.migration; + +import java.util.List; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +/** + * Created by tchemit on 13/09/17. + * + * @author Tony Chemit - dev@tchemit.fr + */ +@MigrationVersion(version = "6.904") +public abstract class DataSourceMigrationForVersion_7_0_RC_9 extends AbstractObserveMigrationCallBack { + + DataSourceMigrationForVersion_7_0_RC_9(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_7_0_RC_9.class, callBack, scriptSuffix); + } + + protected abstract void removeForeignKeys(TopiaSqlSupport topiaSqlSupport, List<String> queries); + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + removeForeignKeys(topiaSqlSupport, queries); + + addScript("01", "rename_longline_obs", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0_RC_9 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void removeForeignKeys(TopiaSqlSupport topiaSqlSupport, List<String> queries) { + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Encounter", "activity", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "SensorUsed", "activity", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Activity", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "BaitsComposition", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Basket", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "BranchlinesComposition", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Catch", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "FloatlinesComposition", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "HooksComposition", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Mitigationtype_set", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Section", "set", queries); + H2DataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Tdr", "set", queries); + } + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0_RC_9 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void removeForeignKeys(TopiaSqlSupport topiaSqlSupport, List<String> queries) { + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "encounter", "activity", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "sensorUsed", "activity", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Activity", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "BaitsComposition", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Basket", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "BranchlinesComposition", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Catch", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "FloatlinesComposition", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "HooksComposition", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Mitigationtype_set", "set", queries); + PGDataSourceMigration.removeFK(topiaSqlSupport, "observe_longline", "Tdr", "set", queries); + } + } + +} + + ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java @@ -233,22 +233,22 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints - String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); + String constraintsName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); // remove constraints - queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, contrainstName)); + queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, constraintsName)); } public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints - String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); + String constraintsName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); - if (contrainstName != null) { + if (constraintsName != null) { // remove constraints - queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, contrainstName)); + queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, constraintsName)); } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java @@ -317,22 +317,22 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints - String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); + String constraintsName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); // remove constraints - queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, contrainstName)); + queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, constraintsName)); } public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints - String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); + String constraintsName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); - if (contrainstName != null) { + if (constraintsName != null) { // remove constraints - queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, contrainstName)); + queries.add(String.format("ALTER TABLE %s.%s DROP CONSTRAINT %s;", schemaName, tableName, constraintsName)); } ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -302,8 +302,8 @@ floatlinesCompositionObs + {*} longline.FloatlinesCompositionObs | reverseDbName hooksCompositionObs + {*} longline.HooksCompositionObs | reverseDbName=setObs section + {*} longline.Section | unique orderBy=settingIdentifier reverseDbName=setObs settingShape {*:1} referentiel.longline.SettingShape -tdr + {*} longline.Tdr | reverseDbName=set -catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set +tdr + {*} longline.Tdr | reverseDbName=setObs +catchLongline + {*} longline.CatchLongline | ordered reverseDbName=setObs lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. ===================================== persistence/src/main/resources/db/migration/6.904/01_rename_longline_obs-H2.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.904/01_rename_longline_obs-H2.sql @@ -0,0 +1,81 @@ +UPDATE OBSERVE_LONGLINE.Activity SET TOPIAID = replace(TOPIAID, 'ActivityLongline', 'ActivityLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Activity RENAME TO ActivityObs; + +DROP INDEX IF EXISTS idx_observe_longline_encounter_activity; +UPDATE OBSERVE_LONGLINE.Encounter SET ACTIVITY = replace(ACTIVITY, 'ActivityLongline', 'ActivityLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Encounter ALTER COLUMN Activity RENAME TO ActivityObs; +ALTER TABLE OBSERVE_LONGLINE.Encounter add constraint fk_Encounter_activityObs foreign key (activityObs) references OBSERVE_LONGLINE.ActivityObs; +CREATE INDEX idx_observe_longline_encounter_activityObs ON OBSERVE_LONGLINE.Encounter(activityObs); + +DROP INDEX IF EXISTS idx_observe_longline_sensorused_activity; +UPDATE OBSERVE_LONGLINE.SensorUsed SET ACTIVITY = replace(ACTIVITY, 'ActivityLongline', 'ActivityLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.SensorUsed ALTER COLUMN Activity RENAME TO ActivityObs; +ALTER TABLE OBSERVE_LONGLINE.SensorUsed add constraint fk_SensorUsed_activityObs foreign key (activityObs) references OBSERVE_LONGLINE.ActivityObs; +CREATE INDEX idx_observe_longline_SensorUsed_activityObs ON OBSERVE_LONGLINE.SensorUsed(activityObs); + +UPDATE OBSERVE_LONGLINE.Set SET TOPIAID = replace(TOPIAID, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Set RENAME TO SetObs; + +DROP INDEX IF EXISTS idx_observe_longline_activity_set; +UPDATE OBSERVE_LONGLINE.ActivityObs SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.ActivityObs ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.ActivityObs add constraint fk_activityObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_ActivityObs_setObs ON OBSERVE_LONGLINE.ActivityObs(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_baitsCompositionObs_set; +UPDATE OBSERVE_LONGLINE.BaitsComposition SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.BaitsComposition ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.BaitsComposition RENAME TO BaitsCompositionObs; +ALTER TABLE OBSERVE_LONGLINE.BaitsCompositionObs add constraint fk_BaitsCompositionObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_BaitsCompositionObs_setObs ON OBSERVE_LONGLINE.BaitsCompositionObs(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_basket_set; +UPDATE OBSERVE_LONGLINE.Basket SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Basket ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.Basket add constraint fk_Basket_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_Basket_setObs ON OBSERVE_LONGLINE.Basket(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_branchlinesComposition_set; +UPDATE OBSERVE_LONGLINE.BranchlinesComposition SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.BranchlinesComposition ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.BranchlinesComposition RENAME TO BranchlinesCompositionObs; +ALTER TABLE OBSERVE_LONGLINE.BranchlinesCompositionObs add constraint fk_BranchlinesCompositionObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_BranchlinesCompositionObs_setObs ON OBSERVE_LONGLINE.BranchlinesCompositionObs(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_catch_set; +UPDATE OBSERVE_LONGLINE.Catch SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Catch ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.Catch add constraint fk_Catch_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_Catch_setObs ON OBSERVE_LONGLINE.Catch(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_floatlinesComposition_set; +UPDATE OBSERVE_LONGLINE.FloatlinesComposition SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.FloatlinesComposition ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.FloatlinesComposition RENAME TO FloatlinesCompositionObs; +ALTER TABLE OBSERVE_LONGLINE.FloatlinesCompositionObs add constraint fk_FloatlinesCompositionObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_FloatlinesCompositionObs_setObs ON OBSERVE_LONGLINE.FloatlinesCompositionObs(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_hooksComposition_set; +UPDATE OBSERVE_LONGLINE.HooksComposition SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.HooksComposition ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.HooksComposition RENAME TO HooksCompositionObs; +ALTER TABLE OBSERVE_LONGLINE.HooksCompositionObs add constraint fk_HooksCompositionObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_HooksCompositionObs_setObs ON OBSERVE_LONGLINE.HooksCompositionObs(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_section_set; +UPDATE OBSERVE_LONGLINE.Section SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Section ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.Section add constraint fk_Section_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_Section_setObs ON OBSERVE_LONGLINE.Section(setObs); + +DROP INDEX IF EXISTS idx_observe_longline_tdr_set; +UPDATE OBSERVE_LONGLINE.Tdr SET SET = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.Tdr ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.Tdr add constraint fk_Tdr_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_Tdr_setObs ON OBSERVE_LONGLINE.tdr(setObs); + +UPDATE OBSERVE_LONGLINE.mitigationtype_set SET Set = replace(SET, 'SetLongline', 'SetLonglineObs'); +ALTER TABLE OBSERVE_LONGLINE.mitigationtype_set ALTER COLUMN Set RENAME TO SetObs; +ALTER TABLE OBSERVE_LONGLINE.mitigationtype_set add constraint fk_mitigationtype_setObs_setObs foreign key (setObs) references OBSERVE_LONGLINE.SetObs; +CREATE INDEX idx_observe_longline_mitigationtype_setObs_setObs ON OBSERVE_LONGLINE.mitigationtype_set(setObs); +ALTER TABLE OBSERVE_LONGLINE.mitigationtype_set RENAME TO mitigationtype_setObs; \ No newline at end of file ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>6.903</observe.model.version> + <observe.model.version>6.904</observe.model.version> <!-- build timestamp configuration --> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -236,17 +236,17 @@ public class ObserveFixtures { public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = ImmutableMap .<String, Long>builder() .put("observe_longline.trip", 1L) - .put("observe_longline.set", 13L) - .put("observe_longline.activity", 13L) + .put("observe_longline.setobs", 13L) + .put("observe_longline.activityobs", 13L) .put("observe_longline.gearusefeatures", 0L) .put("observe_longline.gearusefeaturesmeasurement", 0L) .put("observe_longline.encounter", 27L) .put("observe_longline.sensorused", 0L) .put("observe_longline.tdr", 0L) - .put("observe_longline.baitscomposition", 13L) - .put("observe_longline.floatlinescomposition", 65L) - .put("observe_longline.hookscomposition", 39L) - .put("observe_longline.branchlinescomposition", 13L) + .put("observe_longline.baitscompositionobs", 13L) + .put("observe_longline.floatlinescompositionobs", 65L) + .put("observe_longline.hookscompositionobs", 39L) + .put("observe_longline.branchlinescompositionobs", 13L) .put("observe_longline.section", 234L) .put("observe_longline.basket", 3042L) .put("observe_longline.branchline", 18252L) @@ -256,23 +256,23 @@ public class ObserveFixtures { .put("observe_longline.weightmeasure", 0L) .put("observe_longline.tdrrecord", 0L) .put("observe_longline.species_tdr", 0L) - .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.mitigationtype_setobs", 0L) .build(); public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = ImmutableMap .<String, Long>builder() .put("observe_longline.trip", 1L) - .put("observe_longline.set", 5L) - .put("observe_longline.activity", 5L) + .put("observe_longline.setobs", 5L) + .put("observe_longline.activityobs", 5L) .put("observe_longline.gearusefeatures", 0L) .put("observe_longline.gearusefeaturesmeasurement", 0L) .put("observe_longline.encounter", 3L) .put("observe_longline.sensorused", 0L) .put("observe_longline.tdr", 0L) - .put("observe_longline.baitscomposition", 10L) - .put("observe_longline.floatlinescomposition", 0L) - .put("observe_longline.hookscomposition", 10L) - .put("observe_longline.branchlinescomposition", 2L) + .put("observe_longline.baitscompositionobs", 10L) + .put("observe_longline.floatlinescompositionobs", 0L) + .put("observe_longline.hookscompositionobs", 10L) + .put("observe_longline.branchlinescompositionobs", 2L) .put("observe_longline.section", 95L) .put("observe_longline.basket", 1140L) .put("observe_longline.branchline", 6840L) @@ -281,24 +281,24 @@ public class ObserveFixtures { .put("observe_longline.weightmeasure", 0L) .put("observe_longline.tdrrecord", 0L) .put("observe_longline.species_tdr", 0L) - .put("observe_longline.mitigationtype_set", 0L) + .put("observe_longline.mitigationtype_setobs", 0L) .put("observe_longline.catch_predator", 9L) .build(); public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = ImmutableMap .<String, Long>builder() .put("observe_longline.trip", 1L) - .put("observe_longline.set", 14L) - .put("observe_longline.activity", 14L) + .put("observe_longline.setobs", 14L) + .put("observe_longline.activityobs", 14L) .put("observe_longline.gearusefeatures", 0L) .put("observe_longline.gearusefeaturesmeasurement", 0L) .put("observe_longline.encounter", 12L) .put("observe_longline.sensorused", 0L) .put("observe_longline.tdr", 0L) - .put("observe_longline.baitscomposition", 14L) - .put("observe_longline.floatlinescomposition", 36L) - .put("observe_longline.hookscomposition", 42L) - .put("observe_longline.branchlinescomposition", 14L) + .put("observe_longline.baitscompositionobs", 14L) + .put("observe_longline.floatlinescompositionobs", 36L) + .put("observe_longline.hookscompositionobs", 42L) + .put("observe_longline.branchlinescompositionobs", 14L) .put("observe_longline.section", 243L) .put("observe_longline.basket", 3229L) .put("observe_longline.branchline", 19374L) ===================================== test/src/main/resources/db/6.904/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/6.904/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.904/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/6.904/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.904/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/6.904/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/6.904/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/6.904/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/6.904/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/6.904/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2ec5c505a197fbf9009b2d0387a... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2ec5c505a197fbf9009b2d0387a... You're receiving this email because of your account on gitlab.com.