This is an automated email from the git hooks/post-receive script. New change to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git discards 591e7e2 Renommage ReferenceEntity en ReferentialEntity + introduction ObserveEntity et ObserveDataEntity new 28f6a27 Mise à jour du driver postgresql new 67e1841 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de [...] This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (591e7e2) \ N -- N -- N refs/heads/feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour (67e1841) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 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 67e18410e41275b3e4296a196efc7c9b57a8ef0e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 23:25:03 2015 +0100 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de test (heu faire les migrations à chaque fois qu'on a besoin d'une base pour les test... so L-A-M-E) commit 28f6a271df7b03b34a75b4d3b3e018cded9ecc0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 18:38:58 2015 +0100 Mise à jour du driver postgresql Summary of changes: observe-entities/pom.xml | 2 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 44 +- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../migration/AbstractDataSourceMigration.java | 11 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../DataSourceMigrationForVersion_5_0_1.java | 8 +- ...va => DataSourceMigrationForVersion_5_0_2.java} | 12 +- ...tities.java => ObserveReferentialEntities.java} | 22 +- ...Impl.java => ObserveReferentialEntityImpl.java} | 2 +- .../db/{5.0 => 5.0-1}/remove_open_field-H2.sql | 10 +- .../db/{5.0 => 5.0-1}/remove_open_field-PG.sql | 10 +- .../db/5.0-2/add_lastUpdateDate_field-H2.sql | 676 +++++++++++++++++++++ .../db/5.0-2/add_lastUpdateDate_field-PG.sql | 676 +++++++++++++++++++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 - .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 - .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ----- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 ----- observe-entities/src/main/xmi/observe-common.zargo | Bin 37215 -> 37208 bytes .../src/main/xmi/observe-longline.zargo | Bin 93445 -> 93586 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85015 -> 84567 bytes observe-services-topia/pom.xml | 2 +- .../ird/observe/services/ObserveServiceTopia.java | 120 +--- .../ird/observe/services/binder/BinderEngine.java | 26 +- .../services/binder/BinderEngineInitializer.java | 16 +- .../ird/observe/services/binder/BinderSupport.java | 10 +- .../referential/ReferentialBinderSupport.java | 8 +- .../services/entity/EntitiesSetFactory.java | 10 +- .../entity/SpeciesListEntitiesExtractor.java | 4 +- .../services/service/ReferentialServiceTopia.java | 34 +- .../service/actions/report/ReportServiceTopia.java | 6 +- .../GenerateValidatorDescriptorsFileTool.java | 4 +- .../actions/validate/ValidateServiceTopia.java | 14 +- .../referentiel/LengthWeightParemetersTest.java | 12 +- .../ird/observe/services/DataSourceResource.java | 5 +- .../services/binder/BinderEngineMetadataTest.java | 29 +- .../observe/services/binder/BinderEngineTest.java | 20 +- .../services/service/AbstractServiceTopiaTest.java | 39 +- .../DataSourceDumpProducerServiceTopiaTest.java | 13 +- .../service/DataSourceServiceTopiaTest.java | 8 +- .../services/service/MigrateTestsDatabases.java | 98 +++ .../service/ReferentialServiceTopiaTest.java | 16 +- .../ConsolidateDataServiceTopiaTest.java | 11 +- .../report/AbstractReportServiceTopiaTest.java | 14 +- .../actions/validate/ValidateServiceTopiaTest.java | 12 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 14 +- .../service/seine/RouteServiceTopiaTest.java | 13 +- .../seine/TargetSampleServiceTopiaTest.java | 13 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 18 +- .../service/seine/TripSeineServiceTopiaTest.java | 17 +- .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 438481 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 142316 bytes pom.xml | 7 +- 54 files changed, 1715 insertions(+), 691 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_5_0_2.java} (86%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferenceEntities.java => ObserveReferentialEntities.java} (79%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferentialEntityImpl.java => ObserveReferentialEntityImpl.java} (92%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-H2.sql (71%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-PG.sql (71%) create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java create mode 100644 observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz -- 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 feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit 28f6a271df7b03b34a75b4d3b3e018cded9ecc0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 18:38:58 2015 +0100 Mise à jour du driver postgresql --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e352104..471860c 100644 --- a/pom.xml +++ b/pom.xml @@ -471,10 +471,11 @@ <!-- FIXME Hum je ne suis pas sur que la 176 soit ok. --> <version>1.3.175</version> </dependency> + <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.1-901-1.jdbc4</version> + <version>9.4-1206-jdbc4</version> </dependency> <!-- hibernate --> -- 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 feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit 67e18410e41275b3e4296a196efc7c9b57a8ef0e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 23:25:03 2015 +0100 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de test (heu faire les migrations à chaque fois qu'on a besoin d'une base pour les test... so L-A-M-E) --- observe-entities/pom.xml | 2 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 44 +- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../migration/AbstractDataSourceMigration.java | 11 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../DataSourceMigrationForVersion_5_0_1.java | 8 +- ...va => DataSourceMigrationForVersion_5_0_2.java} | 12 +- .../referentiel/I18nReferenceEntities.java | 4 +- ...tities.java => ObserveReferentialEntities.java} | 22 +- ...Impl.java => ObserveReferentialEntityImpl.java} | 2 +- .../db/{5.0 => 5.0-1}/remove_open_field-H2.sql | 10 +- .../db/{5.0 => 5.0-1}/remove_open_field-PG.sql | 10 +- .../db/5.0-2/add_lastUpdateDate_field-H2.sql | 676 +++++++++++++++++++++ .../db/5.0-2/add_lastUpdateDate_field-PG.sql | 676 +++++++++++++++++++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 - .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 - .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ----- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 ----- observe-entities/src/main/xmi/observe-common.zargo | Bin 37617 -> 37208 bytes .../src/main/xmi/observe-longline.zargo | Bin 96937 -> 93586 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85015 -> 84567 bytes observe-services-topia/pom.xml | 2 +- .../ird/observe/services/ObserveServiceTopia.java | 122 +--- .../ird/observe/services/binder/BinderEngine.java | 26 +- .../services/binder/BinderEngineInitializer.java | 16 +- .../ird/observe/services/binder/BinderSupport.java | 14 +- .../binder/data/ActivityLonglineBinder.java | 5 +- .../data/ActivityLonglineEncouterDtoBinder.java | 4 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 4 +- .../services/binder/data/ActivitySeineBinder.java | 5 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 4 +- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../observe/services/binder/data/RouteBinder.java | 8 +- .../services/binder/data/SetLonglineBinder.java | 8 +- .../binder/data/SetLonglineCatchDtoBinder.java | 4 +- .../SetLonglineDetailCompositionDtoBinder.java | 4 +- .../SetLonglineGlobalCompositionDtoBinder.java | 4 +- .../binder/data/SetLonglineTdrDtoBinder.java | 4 +- .../services/binder/data/SetSeineBinder.java | 8 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 4 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 +- .../services/binder/data/TripLonglineBinder.java | 4 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 4 +- .../services/binder/data/TripSeineBinder.java | 4 +- .../binder/data/TripSeineGearUseDtoBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 20 +- .../services/entity/EntitiesSetFactory.java | 10 +- .../entity/SpeciesListEntitiesExtractor.java | 4 +- .../services/service/ReferentialServiceTopia.java | 36 +- .../service/actions/report/ReportServiceTopia.java | 6 +- .../GenerateValidatorDescriptorsFileTool.java | 4 +- .../actions/validate/ValidateServiceTopia.java | 14 +- .../service/longline/BranchlineServiceTopia.java | 2 +- .../referentiel/LengthWeightParemetersTest.java | 14 +- .../ird/observe/services/DataSourceResource.java | 5 +- .../services/binder/BinderEngineMetadataTest.java | 29 +- .../observe/services/binder/BinderEngineTest.java | 24 +- .../services/service/AbstractServiceTopiaTest.java | 39 +- .../DataSourceDumpProducerServiceTopiaTest.java | 13 +- .../service/DataSourceServiceTopiaTest.java | 8 +- .../services/service/MigrateTestsDatabases.java | 98 +++ .../service/ReferentialServiceTopiaTest.java | 16 +- .../ConsolidateDataServiceTopiaTest.java | 11 +- .../report/AbstractReportServiceTopiaTest.java | 14 +- .../actions/validate/ValidateServiceTopiaTest.java | 12 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 14 +- .../service/seine/RouteServiceTopiaTest.java | 13 +- .../seine/TargetSampleServiceTopiaTest.java | 13 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 18 +- .../service/seine/TripSeineServiceTopiaTest.java | 25 +- .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 438481 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 142316 bytes pom.xml | 2 +- 75 files changed, 1775 insertions(+), 754 deletions(-) diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 6f1c79f..5f9e32d 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -129,7 +129,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> diff --git a/observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java index 5f9ad06..978a6f5 100644 --- a/observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java @@ -22,17 +22,55 @@ package fr.ird.observe; * #L% */ -import org.nuiton.topia.persistence.TopiaEntity; +import fr.ird.observe.entities.ObserveEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.Date; import java.util.List; import java.util.Map; -public abstract class AbstractObserveTopiaDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { +public abstract class AbstractObserveTopiaDao<E extends ObserveEntity> extends AbstractTopiaDao<E> { - public <O> List<O> findAllFromHql(String hql, Map<String, Object> hqlParameters) { + private final GetLastupdateDateSqlQuery getLastUpdateDateSqlQuery; + + protected AbstractObserveTopiaDao() { + String schemaName = getTopiaEntityEnum().dbSchemaName(); + String tableName = getTopiaEntityEnum().dbTableName(); + getLastUpdateDateSqlQuery = new GetLastupdateDateSqlQuery(schemaName, tableName); + } + public Date getLastUpdateDate() { + Date result = topiaSqlSupport.findSingleResult(getLastUpdateDateSqlQuery); + return result; + } + + public <O> List<O> findAllFromHql(String hql, Map<String, Object> hqlParameters) { return findAll(hql, hqlParameters); + } + + private static class GetLastupdateDateSqlQuery extends TopiaSqlQuery<Timestamp> { + + protected final String sql; + + private GetLastupdateDateSqlQuery(String schemaName, String tableName) { + this.sql = "SELECT max(" + ObserveEntity.PROPERTY_LAST_UPDATE_DATE + ") FROM " + schemaName + "." + tableName; + } + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement(sql); + } + + @Override + public Timestamp prepareResult(ResultSet set) throws SQLException { + return set.getTimestamp(1); + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java b/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java index 806df87..77540f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities; import org.nuiton.topia.persistence.TopiaEntity; -public interface Activity extends TopiaEntity, FollowedUpdateEntity{ +public interface Activity extends TopiaEntity{ String PROPERTY_QUADRANT = "quadrant"; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java b/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java index e82d13c..961497a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java @@ -30,7 +30,7 @@ import org.nuiton.topia.persistence.TopiaEntity; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public interface ObserveSet extends TopiaEntity, FollowedUpdateEntity { +public interface ObserveSet extends TopiaEntity { void initCoordinates(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java b/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java index bc7cf53..0bcfbe6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java @@ -39,7 +39,7 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public interface Trip extends CommentableEntity, FollowedUpdateEntity { +public interface Trip extends CommentableEntity { String PROPERTY_START_DATE = "startDate"; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 2e66560..1057701 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -83,14 +83,21 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_2 = Versions.valueOf("4.0.2"); + // FIXME A utiliser en version final 5.0 public static final Version V_5_0 = Versions.valueOf("5.0"); - public static final Version V_5_0_1 = Versions.valueOf("5.0.1"); + public static final Version V_5_0__1 = Versions.valueOf("5.0-1"); + + public static final Version V_5_0__2 = Versions.valueOf("5.0-2"); /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, - V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, V_5_0, V_5_0_1 + V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, + // FIXME A utiliser en version final 5.0 + //V_5_0 + V_5_0__1, V_5_0__2 + }; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java index 1447187..5734c1b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java @@ -31,6 +31,7 @@ import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; /** + * FIXME A utiliser en version final 5.0 * Created on 25/08/15. * * @author Tony Chemit - chemit@codelutin.com @@ -53,7 +54,7 @@ public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationC // Ajout des champs lastUpdate // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdate_field", queries); + addScript("add_lastUpdateDate_field", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java index 96c9f5d..3ce6f53 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java @@ -38,7 +38,7 @@ import java.util.List; public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_5_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0_1, callBack, scriptSuffix); + super(AbstractDataSourceMigration.V_5_0__1, callBack, scriptSuffix); } @Override @@ -47,9 +47,9 @@ public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigratio boolean showSql, boolean showProgression) { - // Ajout des champs lastUpdate - // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdate_field_2", queries); + // Suppression du champ open sur les entités anciennement du type Openable + // See https://forge.codelutin.com/issues/7469 + addScript("remove_open_field", queries); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java similarity index 86% copy from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java copy to observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java index 96c9f5d..ee9282d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_2.java @@ -35,10 +35,10 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigrationCallBack { +public class DataSourceMigrationForVersion_5_0_2 extends AbstractObserveMigrationCallBack { - public DataSourceMigrationForVersion_5_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0_1, callBack, scriptSuffix); + public DataSourceMigrationForVersion_5_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_5_0__2, callBack, scriptSuffix); } @Override @@ -49,11 +49,11 @@ public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigratio // Ajout des champs lastUpdate // See https://forge.codelutin.com/issues/7470 - addScript("add_lastUpdate_field_2", queries); + addScript("add_lastUpdateDate_field", queries); } - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_2 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, H2DataSourceMigration.TYPE); @@ -61,7 +61,7 @@ public class DataSourceMigrationForVersion_5_0_1 extends AbstractObserveMigratio } - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_1 { + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0_2 { public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java index 67a2f91..e52b59e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java @@ -47,7 +47,7 @@ public class I18nReferenceEntities { return "label" + (referenceLocaleOrdinal + 1); } - public static <E extends I18nReferenceEntity> String getLabel(int referenceLocaleOrdinal, E i18nEntity) { + public static <E extends I18nReferentialEntity> String getLabel(int referenceLocaleOrdinal, E i18nEntity) { String result = null; @@ -82,7 +82,7 @@ public class I18nReferenceEntities { } - public static <E extends I18nReferenceEntity> void setLabel(int referenceLocaleOrdinal, E i18nEntity, String label) { + public static <E extends I18nReferentialEntity> void setLabel(int referenceLocaleOrdinal, E i18nEntity, String label) { switch (referenceLocaleOrdinal + 1) { case 1: diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java similarity index 79% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java rename to observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java index 13bf6b8..c9ef0e4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java @@ -34,34 +34,34 @@ import java.util.Iterator; import java.util.List; /** - * Helper class around {@link ReferenceEntity}. + * Helper class around {@link ObserveReferentialEntity}. * * @author Tony Chemit - chemit@codelutin.com * @since 3.0 */ -public class ReferenceEntities { +public class ObserveReferentialEntities { - public static final Predicate<? extends ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { + public static final Predicate<? extends ObserveReferentialEntity> IS_ACTIF_PREDICATE = new Predicate<ObserveReferentialEntity>() { @Override - public boolean apply(ReferenceEntity input) { + public boolean apply(ObserveReferentialEntity input) { return ReferenceStatus.disabled != input.getStatus(); } }; /** Logger. */ - private static final Log log = LogFactory.getLog(ReferenceEntities.class); + private static final Log log = LogFactory.getLog(ObserveReferentialEntities.class); /** * Filter une liste d'entités d'un référentiel en supprimmant toutes les - * entités qui ne sont pas actives {@link ReferenceEntity#getStatus()} + * entités qui ne sont pas actives {@link ObserveReferentialEntity#getStatus()} * * @param list la liste des entitées à filtrer * @param <E> le type des entites du référentiel */ - public static <E extends ReferenceEntity> void filterReferentielListByStatus( + public static <E extends ObserveReferentialEntity> void filterReferentielListByStatus( List<E> list) { - filterReferentielList(list, ReferenceEntities.<E>newEnablePredicate()); + filterReferentielList(list, ObserveReferentialEntities.<E>newEnablePredicate()); } @@ -73,7 +73,7 @@ public class ReferenceEntities { * @param predicate le prédicate à appliquer pour conserver les valeurs * @param <E> le type des entites du référentiel */ - public static <E extends ReferenceEntity> void filterReferentielList( + public static <E extends ObserveReferentialEntity> void filterReferentielList( List<E> list, Predicate<E> predicate) { Iterator<E> itr = list.iterator(); @@ -92,7 +92,7 @@ public class ReferenceEntities { } } - public static <R extends ReferenceEntity> Predicate<R> newEnablePredicate() { + public static <R extends ObserveReferentialEntity> Predicate<R> newEnablePredicate() { return (Predicate<R>) IS_ACTIF_PREDICATE; } @@ -115,7 +115,7 @@ public class ReferenceEntities { } } - protected ReferenceEntities() { + protected ObserveReferentialEntities() { // avoid instance } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java similarity index 92% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java index 50e7ca1..0322566 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.entities.constants.ReferenceStatus; -public abstract class ReferenceEntityImpl extends ReferenceEntityAbstract { +public abstract class ObserveReferentialEntityImpl extends ObserveReferentialEntityAbstract { private static final long serialVersionUID = 1L; diff --git a/observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql b/observe-entities/src/main/resources/db/5.0-1/remove_open_field-H2.sql similarity index 71% rename from observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql rename to observe-entities/src/main/resources/db/5.0-1/remove_open_field-H2.sql index 254198f..7f6c0bb 100644 --- a/observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql +++ b/observe-entities/src/main/resources/db/5.0-1/remove_open_field-H2.sql @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN OPEN; -ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN OPEN; -ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN OPEN; -ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN OPEN; -ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN OPEN; \ No newline at end of file +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS OPEN ; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS OPEN; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql b/observe-entities/src/main/resources/db/5.0-1/remove_open_field-PG.sql similarity index 71% rename from observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql rename to observe-entities/src/main/resources/db/5.0-1/remove_open_field-PG.sql index 254198f..e4c2dde 100644 --- a/observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql +++ b/observe-entities/src/main/resources/db/5.0-1/remove_open_field-PG.sql @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN OPEN; -ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN OPEN; -ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN OPEN; -ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN OPEN; -ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN OPEN; \ No newline at end of file +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS OPEN; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS OPEN; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql b/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql new file mode 100644 index 0000000..7bb8bf5 --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql @@ -0,0 +1,676 @@ +DROP TABLE IF EXISTS OBSERVE_COMMON.LASTUPDATETYPE; + +-- Referentiel commum + +ALTER TABLE OBSERVE_COMMON.COUNTRY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.COUNTRY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.COUNTRY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_COUNTRY; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_COUNTRY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_COUNTRY_LASTUPDATEDATE ON OBSERVE_COMMON.COUNTRY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.FPAZONE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.FPAZONE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.FPAZONE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_FPAZONE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_FPAZONE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_FPAZONE_LASTUPDATEDATE ON OBSERVE_COMMON.FPAZONE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEAR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEAR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEAR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEAR; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEAR_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEAR_LASTUPDATEDATE ON OBSERVE_COMMON.GEAR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEARCARACTERISTIC; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTIC_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTIC_LASTUPDATEDATE ON OBSERVE_COMMON.GEARCARACTERISTIC(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEARCARACTERISTICTYPE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTICTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTICTYPE_LASTUPDATEDATE ON OBSERVE_COMMON.GEARCARACTERISTICTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.HARBOUR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.HARBOUR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.HARBOUR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_HARBOUR; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_HARBOUR_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_HARBOUR_LASTUPDATEDATE ON OBSERVE_COMMON.HARBOUR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_LENGTHWEIGHTPARAMETER; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_LENGTHWEIGHTPARAMETER_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_LENGTHWEIGHTPARAMETER_LASTUPDATEDATE ON OBSERVE_COMMON.LENGTHWEIGHTPARAMETER(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.OCEAN DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.OCEAN DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.OCEAN ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_OCEAN; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_OCEAN_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_OCEAN_LASTUPDATEDATE ON OBSERVE_COMMON.OCEAN(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.ORGANISM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.ORGANISM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.ORGANISM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_ORGANISM; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_ORGANISM_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_ORGANISM_LASTUPDATEDATE ON OBSERVE_COMMON.ORGANISM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.PERSON DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.PERSON DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.PERSON ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_PERSON; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PERSON_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PERSON_LASTUPDATEDATE ON OBSERVE_COMMON.PERSON(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.PROGRAM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.PROGRAM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.PROGRAM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_PROGRAM; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PROGRAM_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PROGRAM_LASTUPDATEDATE ON OBSERVE_COMMON.PROGRAM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SEX DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SEX DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SEX ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SEX; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SEX_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SEX_LASTUPDATEDATE ON OBSERVE_COMMON.SEX(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIES; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIES_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIES_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIESGROUP; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESGROUP_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESGROUP_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIESGROUP(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIESLIST DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESLIST DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESLIST ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIESLIST; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESLIST_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESLIST_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIESLIST(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSEL DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSEL DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSEL ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSEL; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSEL_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSEL_LASTUPDATEDATE ON OBSERVE_COMMON.VESSEL(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSELSIZECATEGORY; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELSIZECATEGORY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELSIZECATEGORY_LASTUPDATEDATE ON OBSERVE_COMMON.VESSELSIZECATEGORY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSELTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSELTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSELTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSELTYPE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELTYPE_LASTUPDATEDATE ON OBSERVE_COMMON.VESSELTYPE(LASTUPDATEDATE); + +-- Référentiel Senne + +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_DETECTIONMODE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_DETECTIONMODE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_DETECTIONMODE_LASTUPDATEDATE ON OBSERVE_SEINE.DETECTIONMODE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTFATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTFATE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTFATE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTOPERATION; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOPERATION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOPERATION_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTOPERATION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTTYPE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTTYPE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBSERVEDSYSTEM; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBSERVEDSYSTEM_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBSERVEDSYSTEM_LASTUPDATEDATE ON OBSERVE_SEINE.OBSERVEDSYSTEM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORDISCARD; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORDISCARD_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORDISCARD_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORDISCARD(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORNOFISHING; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNOFISHING_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNOFISHING_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORNOFISHING(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORNULLSET; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNULLSET_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNULLSET_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORNULLSET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SPECIESFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SPECIESFATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESFATE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESFATE_LASTUPDATEDATE ON OBSERVE_SEINE.SPECIESFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SPECIESSTATUS; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESSTATUS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESSTATUS_LASTUPDATEDATE ON OBSERVE_SEINE.SPECIESSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SURROUNDINGACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SURROUNDINGACTIVITY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SURROUNDINGACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.SURROUNDINGACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOYOPERATION; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYOPERATION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYOPERATION_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOYTYPE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYTYPE_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOYTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_VESSELACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_VESSELACTIVITY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_VESSELACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.VESSELACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTCATEGORY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WEIGHTCATEGORY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WEIGHTCATEGORY_LASTUPDATEDATE ON OBSERVE_SEINE.WEIGHTCATEGORY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.WIND DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.WIND DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.WIND ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WIND; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WIND_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WIND_LASTUPDATEDATE ON OBSERVE_SEINE.WIND(LASTUPDATEDATE); + +-- Référentiel Palangre + +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITHAULINGSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITHAULINGSTATUS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITHAULINGSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITHAULINGSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITSETTINGSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSETTINGSTATUS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSETTINGSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITSETTINGSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_CATCHFATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCHFATE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCHFATE_LASTUPDATEDATE ON OBSERVE_LONGLINE.CATCHFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ENCOUNTERTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTERTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTERTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.ENCOUNTERTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HEALTHNESS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HEALTHNESS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HEALTHNESS_LASTUPDATEDATE ON OBSERVE_LONGLINE.HEALTHNESS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKSIZE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSIZE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSIZE_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKSIZE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ITEMVERTICALPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMVERTICALPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMVERTICALPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.ITEMVERTICALPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LIGHTSTICKSCOLOR; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSCOLOR_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSCOLOR_LASTUPDATEDATE ON OBSERVE_LONGLINE.LIGHTSTICKSCOLOR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LIGHTSTICKSTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.LIGHTSTICKSTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LINETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LINETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LINETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LINETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LINETYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LINETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.LINETYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_MATURITYSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MATURITYSTATUS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MATURITYSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.MATURITYSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_MITIGATIONTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MITIGATIONTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MITIGATIONTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.MITIGATIONTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORBRAND; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORBRAND_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORBRAND_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORBRAND(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORDATAFORMAT; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORDATAFORMAT_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORDATAFORMAT_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORDATAFORMAT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SETTINGSHAPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SETTINGSHAPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SETTINGSHAPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SETTINGSHAPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SIZEMEASURETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURETYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SIZEMEASURETYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_STOMACFULLNESS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_STOMACFULLNESS_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_STOMACFULLNESS_LASTUPDATEDATE ON OBSERVE_LONGLINE.STOMACFULLNESS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIPTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIPTYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIPTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.TRIPTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_VESSELACTIVITY; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_VESSELACTIVITY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_VESSELACTIVITY_LASTUPDATEDATE ON OBSERVE_LONGLINE.VESSELACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTMEASURETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURETYPE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.WEIGHTMEASURETYPE(LASTUPDATEDATE); + +-- Data Senne + +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.ACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ACTIVITY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.ACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_FLOATINGOBJECT; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_FLOATINGOBJECT_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_FLOATINGOBJECT_LASTUPDATEDATE ON OBSERVE_SEINE.FLOATINGOBJECT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURES; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURES_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURES_LASTUPDATEDATE ON OBSERVE_SEINE.GEARUSEFEATURES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETCATCH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETCATCH_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETCATCH_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETCATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETLENGTH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETLENGTH_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETLENGTH_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETLENGTH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETSAMPLE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETSAMPLE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETSAMPLE_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETSAMPLE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTOBSERVEDSPECIES; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOBSERVEDSPECIES_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOBSERVEDSPECIES_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTOBSERVEDSPECIES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTSCHOOLESTIMATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTSCHOOLESTIMATE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTSCHOOLESTIMATE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTSCHOOLESTIMATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.ROUTE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ROUTE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ROUTE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ROUTE_LASTUPDATEDATE ON OBSERVE_SEINE.ROUTE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SCHOOLESTIMATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SCHOOLESTIMATE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SCHOOLESTIMATE_LASTUPDATEDATE ON OBSERVE_SEINE.SCHOOLESTIMATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SET; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SET_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SET_LASTUPDATEDATE ON OBSERVE_SEINE.SET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETCATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETCATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETCATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETCATCH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETCATCH_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETCATCH_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETCATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETLENGTH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETLENGTH_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETLENGTH_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETLENGTH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETSAMPLE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETSAMPLE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETSAMPLE_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETSAMPLE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOY_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRIP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIP; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRIP_LASTUPDATEDATE; +CREATE INDEX OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRIP_LASTUPDATEDATE ON OBSERVE_SEINE.TRIP(LASTUPDATEDATE); + +-- Data Palangre + +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ACTIVITY; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ACTIVITY_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ACTIVITY_LASTUPDATEDATE ON OBSERVE_LONGLINE.ACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITSCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITSCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BASKET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BASKET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BASKET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BASKET; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BASKET_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BASKET_LASTUPDATEDATE ON OBSERVE_LONGLINE.BASKET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BRANCHLINE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINE_LASTUPDATEDATE ON OBSERVE_LONGLINE.BRANCHLINE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.CATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_CATCH; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCH_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCH_LASTUPDATEDATE ON OBSERVE_LONGLINE.CATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ENCOUNTER; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTER_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTER_LASTUPDATEDATE ON OBSERVE_LONGLINE.ENCOUNTER(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_FLOATLINESCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_FLOATLINESCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_FLOATLINESCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.FLOATLINESCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURES; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURES_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURES_LASTUPDATEDATE ON OBSERVE_LONGLINE.GEARUSEFEATURES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKSCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKSCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SECTION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SECTION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SECTION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SECTION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SECTION_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SECTION_LASTUPDATEDATE ON OBSERVE_LONGLINE.SECTION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORUSED; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORUSED_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORUSED_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORUSED(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SET; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SET_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SET_LASTUPDATEDATE ON OBSERVE_LONGLINE.SET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SIZEMEASURE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SIZEMEASURE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TDR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TDR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TDR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TDR; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDR_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDR_LASTUPDATEDATE ON OBSERVE_LONGLINE.TDR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TDRRECORD; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDRRECORD_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDRRECORD_LASTUPDATEDATE ON OBSERVE_LONGLINE.TDRRECORD(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIP; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIP_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIP_LASTUPDATEDATE ON OBSERVE_LONGLINE.TRIP(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL AFTER TOPIACREATEDATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTMEASURE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURE_LASTUPDATEDATE; +CREATE INDEX OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURE_LASTUPDATEDATE ON OBSERVE_LONGLINE.WEIGHTMEASURE(LASTUPDATEDATE); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql b/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql new file mode 100644 index 0000000..f039817 --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql @@ -0,0 +1,676 @@ +DROP TABLE IF EXISTS OBSERVE_COMMON.LASTUPDATETYPE; + +-- Referentiel commum + +ALTER TABLE OBSERVE_COMMON.COUNTRY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.COUNTRY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.COUNTRY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_COUNTRY; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_COUNTRY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_COUNTRY_LASTUPDATEDATE ON OBSERVE_COMMON.COUNTRY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.FPAZONE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.FPAZONE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.FPAZONE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_FPAZONE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_FPAZONE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_FPAZONE_LASTUPDATEDATE ON OBSERVE_COMMON.FPAZONE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEAR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEAR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEAR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEAR; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEAR_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_GEAR_LASTUPDATEDATE ON OBSERVE_COMMON.GEAR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEARCARACTERISTIC; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTIC_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_GEARCARACTERISTIC_LASTUPDATEDATE ON OBSERVE_COMMON.GEARCARACTERISTIC(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_GEARCARACTERISTICTYPE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_GEARCARACTERISTICTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_GEARCARACTERISTICTYPE_LASTUPDATEDATE ON OBSERVE_COMMON.GEARCARACTERISTICTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.HARBOUR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.HARBOUR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.HARBOUR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_HARBOUR; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_HARBOUR_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_HARBOUR_LASTUPDATEDATE ON OBSERVE_COMMON.HARBOUR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_LENGTHWEIGHTPARAMETER; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_LENGTHWEIGHTPARAMETER_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_LENGTHWEIGHTPARAMETER_LASTUPDATEDATE ON OBSERVE_COMMON.LENGTHWEIGHTPARAMETER(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.OCEAN DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.OCEAN DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.OCEAN ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_OCEAN; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_OCEAN_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_OCEAN_LASTUPDATEDATE ON OBSERVE_COMMON.OCEAN(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.ORGANISM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.ORGANISM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.ORGANISM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_ORGANISM; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_ORGANISM_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_ORGANISM_LASTUPDATEDATE ON OBSERVE_COMMON.ORGANISM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.PERSON DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.PERSON DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.PERSON ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_PERSON; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PERSON_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_PERSON_LASTUPDATEDATE ON OBSERVE_COMMON.PERSON(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.PROGRAM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.PROGRAM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.PROGRAM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_PROGRAM; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_PROGRAM_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_PROGRAM_LASTUPDATEDATE ON OBSERVE_COMMON.PROGRAM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SEX DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SEX DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SEX ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SEX; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SEX_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_SEX_LASTUPDATEDATE ON OBSERVE_COMMON.SEX(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIES; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIES_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_SPECIES_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESGROUP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIESGROUP; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESGROUP_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_SPECIESGROUP_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIESGROUP(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.SPECIESLIST DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESLIST DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.SPECIESLIST ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_SPECIESLIST; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_SPECIESLIST_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_SPECIESLIST_LASTUPDATEDATE ON OBSERVE_COMMON.SPECIESLIST(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSEL DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSEL DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSEL ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSEL; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSEL_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_VESSEL_LASTUPDATEDATE ON OBSERVE_COMMON.VESSEL(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSELSIZECATEGORY; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELSIZECATEGORY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_VESSELSIZECATEGORY_LASTUPDATEDATE ON OBSERVE_COMMON.VESSELSIZECATEGORY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_COMMON.VESSELTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_COMMON.VESSELTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_COMMON.VESSELTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_COMMON.OBSERVE_COMMON_VESSELTYPE; +DROP INDEX IF EXISTS OBSERVE_COMMON.INDEX_OBSERVE_COMMON_VESSELTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_COMMON_VESSELTYPE_LASTUPDATEDATE ON OBSERVE_COMMON.VESSELTYPE(LASTUPDATEDATE); + +-- Référentiel Senne + +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.DETECTIONMODE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_DETECTIONMODE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_DETECTIONMODE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_DETECTIONMODE_LASTUPDATEDATE ON OBSERVE_SEINE.DETECTIONMODE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTFATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTFATE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBJECTFATE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTOPERATION; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOPERATION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBJECTOPERATION_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTOPERATION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTTYPE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBJECTTYPE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBSERVEDSYSTEM; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBSERVEDSYSTEM_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBSERVEDSYSTEM_LASTUPDATEDATE ON OBSERVE_SEINE.OBSERVEDSYSTEM(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORDISCARD; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORDISCARD_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_REASONFORDISCARD_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORDISCARD(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORNOFISHING; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNOFISHING_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_REASONFORNOFISHING_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORNOFISHING(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_REASONFORNULLSET; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_REASONFORNULLSET_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_REASONFORNULLSET_LASTUPDATEDATE ON OBSERVE_SEINE.REASONFORNULLSET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SPECIESFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SPECIESFATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESFATE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_SPECIESFATE_LASTUPDATEDATE ON OBSERVE_SEINE.SPECIESFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SPECIESSTATUS; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SPECIESSTATUS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_SPECIESSTATUS_LASTUPDATEDATE ON OBSERVE_SEINE.SPECIESSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SURROUNDINGACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SURROUNDINGACTIVITY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_SURROUNDINGACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.SURROUNDINGACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOYOPERATION; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYOPERATION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYOPERATION_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOYTYPE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TRANSMITTINGBUOYTYPE_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOYTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_VESSELACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_VESSELACTIVITY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_VESSELACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.VESSELACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTCATEGORY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WEIGHTCATEGORY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_WEIGHTCATEGORY_LASTUPDATEDATE ON OBSERVE_SEINE.WEIGHTCATEGORY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.WIND DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.WIND DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.WIND ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WIND; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_WIND_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_WIND_LASTUPDATEDATE ON OBSERVE_SEINE.WIND(LASTUPDATEDATE); + +-- Référentiel Palangre + +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITHAULINGSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITHAULINGSTATUS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BAITHAULINGSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITHAULINGSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITSETTINGSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSETTINGSTATUS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BAITSETTINGSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITSETTINGSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BAITTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCHFATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_CATCHFATE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCHFATE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_CATCHFATE_LASTUPDATEDATE ON OBSERVE_LONGLINE.CATCHFATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ENCOUNTERTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTERTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_ENCOUNTERTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.ENCOUNTERTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HEALTHNESS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HEALTHNESS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_HEALTHNESS_LASTUPDATEDATE ON OBSERVE_LONGLINE.HEALTHNESS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_HOOKPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKSIZE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSIZE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_HOOKSIZE_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKSIZE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_HOOKTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_ITEMHORIZONTALPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ITEMVERTICALPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ITEMVERTICALPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_ITEMVERTICALPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.ITEMVERTICALPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LIGHTSTICKSCOLOR; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSCOLOR_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_LIGHTSTICKSCOLOR_LASTUPDATEDATE ON OBSERVE_LONGLINE.LIGHTSTICKSCOLOR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LIGHTSTICKSTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LIGHTSTICKSTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_LIGHTSTICKSTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.LIGHTSTICKSTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.LINETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.LINETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.LINETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_LINETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_LINETYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_LINETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.LINETYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_MATURITYSTATUS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MATURITYSTATUS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_MATURITYSTATUS_LASTUPDATEDATE ON OBSERVE_LONGLINE.MATURITYSTATUS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_MITIGATIONTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_MITIGATIONTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_MITIGATIONTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.MITIGATIONTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORBRAND; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORBRAND_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SENSORBRAND_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORBRAND(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORDATAFORMAT; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORDATAFORMAT_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SENSORDATAFORMAT_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORDATAFORMAT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SENSORTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SETTINGSHAPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SETTINGSHAPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SETTINGSHAPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SETTINGSHAPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SIZEMEASURETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURETYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SIZEMEASURETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SIZEMEASURETYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_STOMACFULLNESS; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_STOMACFULLNESS_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_STOMACFULLNESS_LASTUPDATEDATE ON OBSERVE_LONGLINE.STOMACFULLNESS(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIPTYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIPTYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_TRIPTYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.TRIPTYPE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_VESSELACTIVITY; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_VESSELACTIVITY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_VESSELACTIVITY_LASTUPDATEDATE ON OBSERVE_LONGLINE.VESSELACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTMEASURETYPE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURETYPE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_WEIGHTMEASURETYPE_LASTUPDATEDATE ON OBSERVE_LONGLINE.WEIGHTMEASURETYPE(LASTUPDATEDATE); + +-- Data Senne + +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.ACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ACTIVITY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ACTIVITY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_ACTIVITY_LASTUPDATEDATE ON OBSERVE_SEINE.ACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_FLOATINGOBJECT; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_FLOATINGOBJECT_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_FLOATINGOBJECT_LASTUPDATEDATE ON OBSERVE_SEINE.FLOATINGOBJECT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURES; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_GEARUSEFEATURES_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_GEARUSEFEATURES_LASTUPDATEDATE ON OBSERVE_SEINE.GEARUSEFEATURES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETCATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETCATCH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETCATCH_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_NONTARGETCATCH_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETCATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETLENGTH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETLENGTH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETLENGTH_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_NONTARGETLENGTH_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETLENGTH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.NONTARGETSAMPLE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_NONTARGETSAMPLE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_NONTARGETSAMPLE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_NONTARGETSAMPLE_LASTUPDATEDATE ON OBSERVE_SEINE.NONTARGETSAMPLE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTOBSERVEDSPECIES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTOBSERVEDSPECIES; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTOBSERVEDSPECIES_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBJECTOBSERVEDSPECIES_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTOBSERVEDSPECIES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.OBJECTSCHOOLESTIMATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_OBJECTSCHOOLESTIMATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_OBJECTSCHOOLESTIMATE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_OBJECTSCHOOLESTIMATE_LASTUPDATEDATE ON OBSERVE_SEINE.OBJECTSCHOOLESTIMATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.ROUTE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ROUTE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_ROUTE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_ROUTE_LASTUPDATEDATE ON OBSERVE_SEINE.ROUTE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SCHOOLESTIMATE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SCHOOLESTIMATE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SCHOOLESTIMATE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_SCHOOLESTIMATE_LASTUPDATEDATE ON OBSERVE_SEINE.SCHOOLESTIMATE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.SET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.SET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.SET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SET; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_SET_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_SET_LASTUPDATEDATE ON OBSERVE_SEINE.SET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETCATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETCATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETCATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETCATCH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETCATCH_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TARGETCATCH_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETCATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETLENGTH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETLENGTH; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETLENGTH_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TARGETLENGTH_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETLENGTH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TARGETSAMPLE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TARGETSAMPLE; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TARGETSAMPLE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TARGETSAMPLE_LASTUPDATEDATE ON OBSERVE_SEINE.TARGETSAMPLE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRANSMITTINGBUOY; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRANSMITTINGBUOY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TRANSMITTINGBUOY_LASTUPDATEDATE ON OBSERVE_SEINE.TRANSMITTINGBUOY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_SEINE.TRIP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIP; +DROP INDEX IF EXISTS OBSERVE_SEINE.INDEX_OBSERVE_SEINE_TRIP_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_SEINE_TRIP_LASTUPDATEDATE ON OBSERVE_SEINE.TRIP(LASTUPDATEDATE); + +-- Data Palangre + +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ACTIVITY; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ACTIVITY_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_ACTIVITY_LASTUPDATEDATE ON OBSERVE_LONGLINE.ACTIVITY(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BAITSCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BAITSCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BAITSCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BAITSCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.BAITSCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BASKET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BASKET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BASKET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BASKET; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BASKET_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BASKET_LASTUPDATEDATE ON OBSERVE_LONGLINE.BASKET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BRANCHLINE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BRANCHLINE_LASTUPDATEDATE ON OBSERVE_LONGLINE.BRANCHLINE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_BRANCHLINESCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.BRANCHLINESCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.CATCH DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCH DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.CATCH ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_CATCH; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_CATCH_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_CATCH_LASTUPDATEDATE ON OBSERVE_LONGLINE.CATCH(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.ENCOUNTER ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_ENCOUNTER; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_ENCOUNTER_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_ENCOUNTER_LASTUPDATEDATE ON OBSERVE_LONGLINE.ENCOUNTER(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.FLOATLINESCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_FLOATLINESCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_FLOATLINESCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_FLOATLINESCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.FLOATLINESCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURES ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURES; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURES_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_GEARUSEFEATURES_LASTUPDATEDATE ON OBSERVE_LONGLINE.GEARUSEFEATURES(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_GEARUSEFEATURESMEASUREMENT_LASTUPDATEDATE ON OBSERVE_LONGLINE.GEARUSEFEATURESMEASUREMENT(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.HOOKSCOMPOSITION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_HOOKSCOMPOSITION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_HOOKSCOMPOSITION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_HOOKSCOMPOSITION_LASTUPDATEDATE ON OBSERVE_LONGLINE.HOOKSCOMPOSITION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SECTION DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SECTION DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SECTION ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SECTION; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SECTION_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SECTION_LASTUPDATEDATE ON OBSERVE_LONGLINE.SECTION(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SENSORUSED ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SENSORUSED; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SENSORUSED_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SENSORUSED_LASTUPDATEDATE ON OBSERVE_LONGLINE.SENSORUSED(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SET DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SET DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SET ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SET; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SET_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SET_LASTUPDATEDATE ON OBSERVE_LONGLINE.SET(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_SIZEMEASURE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_SIZEMEASURE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_SIZEMEASURE_LASTUPDATEDATE ON OBSERVE_LONGLINE.SIZEMEASURE(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TDR DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TDR DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TDR ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TDR; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDR_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_TDR_LASTUPDATEDATE ON OBSERVE_LONGLINE.TDR(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TDRRECORD ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TDRRECORD; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TDRRECORD_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_TDRRECORD_LASTUPDATEDATE ON OBSERVE_LONGLINE.TDRRECORD(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.TRIP ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_TRIP; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_TRIP_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_TRIP_LASTUPDATEDATE ON OBSERVE_LONGLINE.TRIP(LASTUPDATEDATE); + +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE DROP COLUMN IF EXISTS LASTUPDATEDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE DROP COLUMN IF EXISTS LASTUPDATE; +ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURE ADD COLUMN LASTUPDATEDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.OBSERVE_LONGLINE_WEIGHTMEASURE; +DROP INDEX IF EXISTS OBSERVE_LONGLINE.INDEX_OBSERVE_LONGLINE_WEIGHTMEASURE_LASTUPDATEDATE; +CREATE INDEX INDEX_OBSERVE_LONGLINE_WEIGHTMEASURE_LASTUPDATEDATE ON OBSERVE_LONGLINE.WEIGHTMEASURE(LASTUPDATEDATE); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql deleted file mode 100644 index 94e0622..0000000 --- a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql b/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql deleted file mode 100644 index 6564a44..0000000 --- a/observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE OBSERVE_SEINE.FLOATINGOBJECT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); diff --git a/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql b/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql deleted file mode 100644 index e26235f..0000000 --- a/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql +++ /dev/null @@ -1,153 +0,0 @@ - - --- Referentiel commum -ALTER TABLE OBSERVE_COMMON.COUNTRY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.FPAZONE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEAR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.HARBOUR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.OCEAN ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.ORGANISM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.PERSON ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.PROGRAM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SEX ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIES ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIESGROUP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIESLIST ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSEL ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSELTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Référentiel Senne -ALTER TABLE OBSERVE_SEINE.DETECTIONMODE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SPECIESFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.WIND ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Référentiel Palangre -ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.BAITTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.CATCHFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LINETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Entitées Senne -ALTER TABLE OBSERVE_SEINE.ACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.ROUTE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRIP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Entitées Palangre -ALTER TABLE OBSERVE_LONGLINE.ACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.TRIP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - - --- Création de la table d'historisation -CREATE TABLE OBSERVE_COMMON.LASTUPDATETYPE (TOPIAID VARCHAR(255) NOT NULL, TOPIAVERSION BIGINT NOT NULL, TOPIACREATEDATE TIMESTAMP, TYPE VARCHAR(255) NOT NULL, LASTUPDATE TIMESTAMP NOT NULL); -ALTER TABLE OBSERVE_COMMON.LASTUPDATETYPE ADD CONSTRAINT PK_LASTUPDATETYPE PRIMARY KEY(TOPIAID); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Country', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.FpaZone', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Gear', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.GearCaracteristic', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.GearCaracteristicType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Harbour', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.LengthWeightParameter', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Ocean', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Organism', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Person', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.11', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Program', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Sex', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Species', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.SpeciesGroup', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.SpeciesList', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Vessel', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.VesselSizeCategory', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.18', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.VesselType', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.DetectionMode', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectFate', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectOperation', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObservedSystem', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForDiscard', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForNullSet', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SpeciesFate', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SpeciesStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SurroundingActivity', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.WeightCategory', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.Wind', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitSettingStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFateLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.EncounterType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.Healthness', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookSize', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.11', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksColor', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LineType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MaturityStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MitigationType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorBrand', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.18', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorDataFormat', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.19', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.20', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SettingShape', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.21', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.22', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.StomacFullness', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.23', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.TripType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.24', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivityLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.25', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.ActivitySeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.Route', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.SetSeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.TripSeine', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.ActivityLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.SetLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.TripLongline', CURRENT_TIMESTAMP); diff --git a/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql b/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql deleted file mode 100644 index cd1a3f6..0000000 --- a/observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql +++ /dev/null @@ -1,154 +0,0 @@ - - --- Referentiel commum -ALTER TABLE OBSERVE_COMMON.COUNTRY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.FPAZONE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEAR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.HARBOUR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.LENGTHWEIGHTPARAMETER ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.OCEAN ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.ORGANISM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.PERSON ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.PROGRAM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SEX ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIES ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIESGROUP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.SPECIESLIST ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSEL ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSELSIZECATEGORY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_COMMON.VESSELTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Référentiel senne -ALTER TABLE OBSERVE_SEINE.DETECTIONMODE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTOPERATION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBJECTTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.OBSERVEDSYSTEM ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORDISCARD ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORNOFISHING ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.REASONFORNULLSET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SPECIESFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SPECIESSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SURROUNDINGACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYOPERATION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRANSMITTINGBUOYTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.VESSELACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.WEIGHTCATEGORY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.WIND ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Référentiel Palangre -ALTER TABLE OBSERVE_LONGLINE.BAITHAULINGSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.BAITSETTINGSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.BAITTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.CATCHFATE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ENCOUNTERTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HEALTHNESS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKSIZE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.HOOKTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ITEMHORIZONTALPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.ITEMVERTICALPOSITION ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSCOLOR ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LIGHTSTICKSTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.LINETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.MATURITYSTATUS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.MITIGATIONTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORBRAND ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORDATAFORMAT ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SENSORTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SETTINGSHAPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SIZEMEASURETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.STOMACFULLNESS ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.TRIPTYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.VESSELACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.WEIGHTMEASURETYPE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Entitées Senne -ALTER TABLE OBSERVE_SEINE.ACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.ROUTE ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.SET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_SEINE.TRIP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - --- Entitées Palangre -ALTER TABLE OBSERVE_LONGLINE.ACTIVITY ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.SET ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE OBSERVE_LONGLINE.TRIP ADD COLUMN LASTUPDATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; - - --- Création de la table d'historisation - -CREATE TABLE OBSERVE_COMMON.LASTUPDATETYPE (TOPIAID CHARACTER VARYING(255) NOT NULL, TOPIAVERSION BIGINT NOT NULL, TOPIACREATEDATE TIMESTAMP, TYPE CHARACTER VARYING(255) NOT NULL, LASTUPDATE TIMESTAMP NOT NULL); -ALTER TABLE OBSERVE_COMMON.LASTUPDATETYPE ADD CONSTRAINT PK_LASTUPDATETYPE PRIMARY KEY(TOPIAID); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Country', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.FpaZone', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Gear', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.GearCaracteristic', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.GearCaracteristicType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Harbour', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.LengthWeightParameter', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Ocean', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Organism', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Person', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.11', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Program', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Sex', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Species', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.SpeciesGroup', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.SpeciesList', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.Vessel', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.VesselSizeCategory', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#0.18', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.VesselType', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.DetectionMode', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectFate', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectOperation', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObjectType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ObservedSystem', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForDiscard', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.ReasonForNullSet', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SpeciesFate', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SpeciesStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SurroundingActivity', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.WeightCategory', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#1.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.Wind', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitSettingStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFateLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.05', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.EncounterType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.06', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.Healthness', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.07', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.08', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookSize', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.09', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.10', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.11', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.12', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksColor', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.13', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.14', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LineType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.15', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MaturityStatus', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.16', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MitigationType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.17', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorBrand', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.18', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorDataFormat', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.19', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SensorType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.20', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SettingShape', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.21', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.22', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.StomacFullness', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.23', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.TripType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.24', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivityLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#2.25', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.ActivitySeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.Route', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.SetSeine', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#3.04', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.TripSeine', CURRENT_TIMESTAMP); - -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.01', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.ActivityLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.02', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.SetLongline', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATETYPE VALUES ('fr.ird.observe.entities.LastUpdateType#1236861982132#4.03', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.TripLongline', CURRENT_TIMESTAMP); diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index c472cb6..1dfc7c4 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 9af82f6..41164f5 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 227cb93..0a7451d 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 39de3ed..2957acc 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -123,7 +123,7 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index df37fb8..fa44f55 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -29,11 +29,11 @@ import com.google.common.collect.Multimap; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.FollowedUpdateEntity; -import fr.ird.observe.entities.LastUpdateType; -import fr.ird.observe.entities.LastUpdateTypeTopiaDao; +import fr.ird.observe.entities.ObserveDataEntity; +import fr.ird.observe.entities.ObserveEntity; +import fr.ird.observe.entities.ObserveEntityTopiaDao; import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -91,7 +91,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dataEntityType; } - public static <D extends ReferentialDto, E extends ReferenceEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { + public static <D extends ReferentialDto, E extends ObserveReferentialEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { Class<E> referentialEntityType = BINDER_ENGINE.getReferentialEntityType(dtoType); return referentialEntityType; } @@ -144,9 +144,10 @@ public abstract class ObserveServiceTopia implements ObserveService { return entities; } - protected <E extends TopiaEntity & FollowedUpdateEntity> Date saveFollowedEntity(E entity) { + protected <E extends ObserveEntity> Date saveFollowedEntity(E entity) { - Date lastUpdateDate = setLastUpdate(entity); + Date lastUpdateDate = now(); + entity.setLastUpdateDate(lastUpdateDate); // on met à jour l'entité (cela permet de récupérer son topiaId si l'objet est créé) TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entity); @@ -156,89 +157,28 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <P extends TopiaEntity & FollowedUpdateEntity, E extends TopiaEntity> Date saveFollowedEntity(P parentEntity, E entity) { + //FIXME Remove this ? + @Deprecated + protected <P extends ObserveEntity, E extends ObserveEntity> Date saveFollowedEntity(P parentEntity, E entity) { // on met à jour l'entité (cela permet de récupérer son topiaId si l'objet est créé) TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entity); dao.update(entity); - Date lastUpdateDate = setLastUpdate(parentEntity); + Date lastUpdateDate = now(); + parentEntity.setLastUpdateDate(lastUpdateDate); + entity.setLastUpdateDate(lastUpdateDate); + return lastUpdateDate; } - protected <E extends FollowedUpdateEntity> Date setLastUpdate(Class<E> entityType) { - - Date lastUpdate = now(); + protected <E extends ObserveEntity> Optional<Date> getLastUpdate(Class<E> entityType) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + ObserveEntityTopiaDao dao = (ObserveEntityTopiaDao) persistenceContext.getDao(entityType); - LastUpdateTypeTopiaDao dao = persistenceContext.getLastUpdateTypeDao(); - - LastUpdateType lastUpdateType = dao.forTypeEquals(entityType.getCanonicalName()).findUniqueOrNull(); - - if (lastUpdateType == null) { - - lastUpdateType = dao.newInstance(); - - lastUpdateType.setType(entityType.getCanonicalName()); - - } - - lastUpdateType.setLastUpdate(lastUpdate); - dao.update(lastUpdateType); - - return lastUpdate; - - } - - protected <E extends TopiaEntity & FollowedUpdateEntity> Date setLastUpdate(E entity) { - - Date lastUpdate = now(); - entity.setLastUpdate(lastUpdate); - - ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); - - Class<E> entityType = persistenceContext.getType(entity); - - LastUpdateTypeTopiaDao dao = persistenceContext.getLastUpdateTypeDao(); - - LastUpdateType lastUpdateType = dao.forTypeEquals(entityType.getCanonicalName()).findUniqueOrNull(); - - if (lastUpdateType == null) { - - lastUpdateType = dao.newInstance(); - - lastUpdateType.setType(entityType.getCanonicalName()); - - } - - lastUpdateType.setLastUpdate(lastUpdate); - - dao.update(lastUpdateType); - - return lastUpdate; - - } - - - protected <E extends TopiaEntity> Optional<Date> getLastUpdate(Class<E> entityType) { - - Optional<Date> result = Optional.absent(); - - if (FollowedUpdateEntity.class.isAssignableFrom(entityType)) { - - ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - - LastUpdateTypeTopiaDao dao = persistenceContext.getLastUpdateTypeDao(); - - Optional<LastUpdateType> lastUpdateTypeOptional = dao.forTypeEquals(entityType.getCanonicalName()).tryFindUnique(); - - if (lastUpdateTypeOptional.isPresent()) { - result = Optional.of(lastUpdateTypeOptional.get().getLastUpdate()); - } - - } + Optional<Date> result = Optional.fromNullable(dao.getLastUpdateDate()); return result; } @@ -252,10 +192,6 @@ public abstract class ObserveServiceTopia implements ObserveService { throw new DataNotFoundException(dtoType, id); } dao.delete(entity); - if (FollowedUpdateEntity.class.isAssignableFrom(entityType)) { - Class<? extends FollowedUpdateEntity> followedUpdateType = (Class<? extends FollowedUpdateEntity>) entityType; - setLastUpdate(followedUpdateType); - } } } @@ -271,9 +207,9 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ReferenceEntity, D extends ReferentialDto> Form<D> referentialEntityToForm(Class<D> dtoType, - E entity, - ReferenceSetRequestDefinitions referentialRequestDefinition) { + protected <E extends ObserveReferentialEntity, D extends ReferentialDto> Form<D> referentialEntityToForm(Class<D> dtoType, + E entity, + ReferenceSetRequestDefinitions referentialRequestDefinition) { D dto = BINDER_ENGINE.transformEntityToReferentialDto(serviceContext.getReferentialLocale(), entity); @@ -289,7 +225,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ReferenceEntity, D extends ReferentialDto> void copyReferentialDtoToEntity(D dto, E entity) { + protected <E extends ObserveReferentialEntity, D extends ReferentialDto> void copyReferentialDtoToEntity(D dto, E entity) { BINDER_ENGINE.copyReferentialDtoToEntity(serviceContext.getReferentialLocale(), dto, entity); @@ -310,7 +246,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return entity; } - protected <E extends ReferenceEntity, D extends ReferentialDto> E loadOrCreateEntityFromReferentialDto(D dto) { + protected <E extends ObserveReferentialEntity, D extends ReferentialDto> E loadOrCreateEntityFromReferentialDto(D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); @@ -325,17 +261,17 @@ public abstract class ObserveServiceTopia implements ObserveService { return entity; } - protected <E extends TopiaEntity & FollowedUpdateEntity, D extends DataDto> E loadOrCreateEntityAndCheckLastUpdate(D dto) { + protected <E extends ObserveDataEntity, D extends DataDto> E loadOrCreateEntityAndCheckLastUpdate(D dto) { E entity = loadOrCreateEntityFromDataDto(dto); checkLastUpdateDate(entity, dto); return entity; } - protected <E extends FollowedUpdateEntity, D extends IdDto & FollowedUpdateDto> void checkLastUpdateDate(E entity, D dto) { + protected <E extends ObserveEntity, D extends IdDto & FollowedUpdateDto> void checkLastUpdateDate(E entity, D dto) { if (dto.isPersisted()) { - Date lasUpdate = entity.getLastUpdate(); + Date lasUpdate = entity.getLastUpdateDate(); Date currentUpdate = dto.getLastUpdate(); @@ -513,7 +449,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dao.forTopiaIdEquals(id).exists(); } - protected <D extends ReferentialDto> ReferentialReference<D> toReference(ReferenceEntity entity) { + protected <D extends ReferentialDto> ReferentialReference<D> toReference(ObserveReferentialEntity entity) { ReferentialReference<D> reference = BinderEngine.get().transformEntityToReferentialReferenceDto(getReferentialLocale(), entity); return reference; @@ -546,7 +482,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends ReferentialDto, E extends ReferenceEntity> ReferentialReferenceSet<D> toReferentialReferenceSet(Class<D> dtoType, List<E> allStubByTripId, Date lastUpdate) { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialReferenceSet<D> toReferentialReferenceSet(Class<D> dtoType, List<E> allStubByTripId, Date lastUpdate) { ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -571,7 +507,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends ReferentialDto, E extends ReferenceEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { ReferentialBinderSupport<E, D> reference = BINDER_ENGINE.getReferentialBinder(dtoType); return reference; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java index caa1f1f..c4c04d6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; @@ -29,11 +29,11 @@ public class BinderEngine implements ReferenceBinderEngine { protected ImmutableMap<Class<? extends DataDto>, BinderSupport> dataBinders; - protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes; + protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes; protected ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypes; - protected ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; + protected ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; protected ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; @@ -57,7 +57,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { return (ReferentialBinderSupport) referentialBinders.get(dtoType); } @@ -91,13 +91,13 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> Class<D> getReferentialDtoType(Class<E> entityType) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> Class<D> getReferentialDtoType(Class<E> entityType) { Class<D> result = (Class<D>) referentialEntityToDtoTypes.get(entityType); if (result == null) { // Pour gérer le cas des proxy hibernate qui ne sont pas égale à la classe proxifiée //FIXME Trouver une meilleure solution String name = entityType.getName(); - for (Map.Entry<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> entry : referentialEntityToDtoTypes.entrySet()) { + for (Map.Entry<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> entry : referentialEntityToDtoTypes.entrySet()) { if (name.startsWith(entry.getKey().getName())) { result = (Class<D>) entry.getValue(); break; @@ -107,11 +107,11 @@ public class BinderEngine implements ReferenceBinderEngine { return result; } - public <D extends ReferentialDto, E extends ReferenceEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { return (Class<E>) referentialDtoToEntityTypes.get(dtoType); } - public <D extends ReferentialDto, E extends ReferenceEntity> D transformEntityToReferentialDto(ReferentialLocale referentialLocale, E entity) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> D transformEntityToReferentialDto(ReferentialLocale referentialLocale, E entity) { Class<D> dtoType = getReferentialDtoType(entity.getClass()); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -123,7 +123,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> E transformReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> E transformReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -178,7 +178,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> ReferentialReference<D> transformEntityToReferentialReferenceDto(ReferentialLocale referentialLocale, E entity) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialReference<D> transformEntityToReferentialReferenceDto(ReferentialLocale referentialLocale, E entity) { Class<D> dtoType = getReferentialDtoType(entity.getClass()); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -197,7 +197,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> void copyReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { + public <D extends ReferentialDto, E extends ObserveReferentialEntity> void copyReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { Class<D> dtoType = (Class<D>) dto.getClass(); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -210,7 +210,7 @@ public class BinderEngine implements ReferenceBinderEngine { return ImmutableSet.copyOf(getReferentialDtoToEntityTypes().keySet()); } - public ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> getReferentialEntityToDtoTypes() { + public ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> getReferentialEntityToDtoTypes() { return referentialEntityToDtoTypes; } @@ -222,7 +222,7 @@ public class BinderEngine implements ReferenceBinderEngine { return dataDtoToEntityTypes; } - protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> getReferentialDtoToEntityTypes() { + protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> getReferentialDtoToEntityTypes() { return referentialDtoToEntityTypes; } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index 64d0f22..7a969f8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -31,7 +31,7 @@ import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; @@ -340,9 +340,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { ImmutableMap.Builder<Class<? extends DataDto>, BinderSupport> dataBinderBuilder; - ImmutableMap.Builder<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypeBuilder; + ImmutableMap.Builder<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypeBuilder; - ImmutableMap.Builder<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypeBuilder; + ImmutableMap.Builder<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypeBuilder; ImmutableMap.Builder<Class<? extends ReferentialDto>, BinderSupport> referentialBinderBuilder; @@ -350,9 +350,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; - ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes; + ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes; - ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; + ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; ImmutableMap<Class<? extends DataDto>, BinderSupport> dataBinders; @@ -392,15 +392,15 @@ class BinderEngineInitializer implements ObserveModelInitializer { } } - for (Map.Entry<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> entry : referentialDtoToEntityTypes.entrySet()) { + for (Map.Entry<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> entry : referentialDtoToEntityTypes.entrySet()) { Class<? extends ReferentialDto> dtoType = entry.getKey(); - Class<? extends ReferenceEntity> entityType = entry.getValue(); + Class<? extends ObserveReferentialEntity> entityType = entry.getValue(); if ((entityType.getSimpleName() + "Dto").equals(dtoType.getSimpleName())) { ObserveEntityEnum observeEntityEnum = ObserveEntityEnum.valueOf(entityType); referentialEntityToDtoTypeBuilder.put(entityType, dtoType); - referentialEntityToDtoTypeBuilder.put((Class<? extends ReferenceEntity>) observeEntityEnum.getImplementation(), dtoType); + referentialEntityToDtoTypeBuilder.put((Class<? extends ObserveReferentialEntity>) observeEntityEnum.getImplementation(), dtoType); } } dataEntityToDtoTypes = dataEntityToDtoTypeBuilder.build(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java index 3d1c949..a798046 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java @@ -5,8 +5,8 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.I18nReferentialEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; @@ -147,7 +147,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- REFERENTIAL REFERENCE → ENTITY ---------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <DD extends ReferentialDto, EE extends ReferenceEntity> EE toEntity(ReferentialReference<DD> reference, Class<EE> entityType) { + protected <DD extends ReferentialDto, EE extends ObserveReferentialEntity> EE toEntity(ReferentialReference<DD> reference, Class<EE> entityType) { EE entity = null; @@ -167,7 +167,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- REFERENTIAL → ENTITY -------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <DD extends ReferentialDto, EE extends ReferenceEntity> LinkedHashSet<EE> toEntitySet(Collection<ReferentialReference<DD>> references, Class<EE> entityType) { + protected <DD extends ReferentialDto, EE extends ObserveReferentialEntity> LinkedHashSet<EE> toEntitySet(Collection<ReferentialReference<DD>> references, Class<EE> entityType) { LinkedHashSet<EE> entityList = null; if (CollectionUtils.isNotEmpty(references)) { @@ -194,7 +194,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- ENTITY → REFERENTIAL REFERENCE ---------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <EE extends ReferenceEntity, DD extends ReferentialDto> ReferentialReference<DD> toReferentialReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { + protected <EE extends ObserveReferentialEntity, DD extends ReferentialDto> ReferentialReference<DD> toReferentialReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { ReferentialReference<DD> reference = null; if (entity != null) { @@ -207,7 +207,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { } - protected <EE extends ReferenceEntity, DD extends ReferentialDto> List<ReferentialReference<DD>> toReferentialReferenceList(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { + protected <EE extends ObserveReferentialEntity, DD extends ReferentialDto> List<ReferentialReference<DD>> toReferentialReferenceList(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { List<ReferentialReference<DD>> references = null; if (CollectionUtils.isNotEmpty(entities)) { @@ -232,7 +232,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- LABELS ---------------------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected String getLabel(ReferentialLocale locale, I18nReferenceEntity entity) { + protected String getLabel(ReferentialLocale locale, I18nReferentialEntity entity) { return I18nReferenceEntities.getLabel(locale.ordinal(), entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java index d9672f3..e4ea0f7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.DataReference; @@ -25,7 +24,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setTimeStamp(dto.getTimeStamp()); @@ -41,7 +40,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setTimeStamp(entity.getTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java index 1cb1c99..3fcc387 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java @@ -22,7 +22,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineEncouterDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setEncounter(toEntityCollection(referentialLocale, dto.getEncounter(), Encounter.class, entity.getEncounter())); @@ -33,7 +33,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineEncouterDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setEncounter(toLinkedHashSetData(referentialLocale, entity.getEncounter(), EncounterDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java index ebc943b..5f78391 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java @@ -21,7 +21,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineSensorUsedDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setSensorUsed(toEntityCollection(referentialLocale, dto.getSensorUsed(), SensorUsed.class, entity.getSensorUsed())); @@ -32,7 +32,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineSensorUsedDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setSensorUsed(toLinkedHashSetData(referentialLocale, entity.getSensorUsed(), SensorUsedDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java index ed65f3d..4813198 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java @@ -7,7 +7,6 @@ import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -34,7 +33,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineDto dto, ActivitySeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setTime(dto.getTime()); @@ -60,7 +59,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setTime(dto.getTime()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java index 352d0f0..a58b4fe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java @@ -21,7 +21,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineObservedSystemDto dto, ActivitySeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setObservedSystem(toEntitySet(dto.getObservedSystem(), ObservedSystem.class)); @@ -32,7 +32,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineObservedSystemDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java index e9b98f4..efe677a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java @@ -26,7 +26,7 @@ public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, dto.setId(entity.getTopiaId()); dto.setTime(entity.getTime()); - dto.setTime(entity.getLastUpdate()); + dto.setTime(entity.getLastUpdateDate()); dto.setLatitude(entity.getLatitude()); dto.setLongitude(entity.getLongitude()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java index 37124db..274989b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java @@ -21,14 +21,14 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { public void copyToEntity(ReferentialLocale referentialLocale, RouteDto dto, Route entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setDate(dto.getDate()); entity.setStartLogValue(dto.getStartLogValue()); entity.setEndLogValue(dto.getEndLogValue()); entity.setCheckLevel(dto.getCheckLevel()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); } @@ -36,14 +36,14 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { public void copyToDto(ReferentialLocale referentialLocale, Route entity, RouteDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setDate(entity.getDate()); dto.setStartLogValue(entity.getStartLogValue()); dto.setEndLogValue(entity.getEndLogValue()); dto.setCheckLevel(entity.getCheckLevel()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setActivitySeine(toLinkedHashSetData(referentialLocale, entity.getActivitySeine(), ActivitySeineStubDto.class)); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java index 2d85efd..bb00070 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java @@ -28,7 +28,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setHomeId(dto.getHomeId()); @@ -63,7 +63,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin entity.setHaulingEndLongitude(dto.getHaulingEndLongitude()); entity.setHaulingBreaks(dto.getHaulingBreaks()); entity.setMonitored(dto.getMonitored()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSettingShape(toEntity(dto.getSettingShape(), SettingShape.class)); entity.setLineType(toEntity(dto.getLineType(), LineType.class)); entity.setLightsticksType(toEntity(dto.getLightsticksType(), LightsticksType.class)); @@ -75,7 +75,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setHomeId(entity.getHomeId()); @@ -110,7 +110,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin dto.setHaulingEndLongitude(entity.getHaulingEndLongitude()); dto.setHaulingBreaks(entity.getHaulingBreaks()); dto.setMonitored(entity.getMonitored()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSettingShape(toReferentialReference(referentialLocale, entity.getSettingShape(), SettingShapeDto.class)); dto.setLineType(toReferentialReference(referentialLocale, entity.getLineType(), LineTypeDto.class)); dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType(), LightsticksTypeDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java index b15ed23..2bf38af 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java @@ -21,7 +21,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineCatchDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setCatchLongline(toEntitySet(referentialLocale, dto.getCatchLongline(), CatchLongline.class, entity.getCatchLongline())); @@ -31,7 +31,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineCatchDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setCatchLongline(toLinkedHashSetData(referentialLocale, entity.getCatchLongline(), CatchLonglineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java index 02e4ec5..7db0ee5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java @@ -21,7 +21,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDetailCompositionDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSection(toEntitySet(referentialLocale, dto.getSection(), Section.class, entity.getSection())); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -38,7 +38,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDetailCompositionDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSection(toLinkedHashSetData(referentialLocale, entity.getSection(), SectionDto.class)); dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java index 8cd837e..fd648ef 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java @@ -29,7 +29,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineGlobalCompositionDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setFloatlinesComposition(toEntityCollection(referentialLocale, dto.getFloatlinesComposition(), FloatlinesComposition.class, entity.getFloatlinesComposition())); @@ -44,7 +44,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineGlobalCompositionDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setFloatlinesComposition(toLinkedHashSetData(referentialLocale, entity.getFloatlinesComposition(), FloatlinesCompositionDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java index 19e0bdb..6aa735a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java @@ -19,7 +19,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineTdrDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -29,7 +29,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineTdrDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java index 96bb056..29befd9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java @@ -22,7 +22,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { public void copyToEntity(ReferentialLocale referentialLocale, SetSeineDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartTime(dto.getStartTime()); @@ -39,7 +39,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { entity.setTargetDiscarded(dto.getTargetDiscarded()); entity.setNonTargetDiscarded(dto.getNonTargetDiscarded()); entity.setCurrentMeasureDepth(dto.getCurrentMeasureDepth()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType())); entity.setReasonForNullSet(toEntity(dto.getReasonForNullSet(), ReasonForNullSet.class)); @@ -49,7 +49,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartTime(entity.getStartTime()); @@ -66,7 +66,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { dto.setTargetDiscarded(entity.getTargetDiscarded()); dto.setNonTargetDiscarded(entity.getNonTargetDiscarded()); dto.setCurrentMeasureDepth(entity.getCurrentMeasureDepth()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType())); dto.setReasonForNullSet(toReferentialReference(referentialLocale, entity.getReasonForNullSet(), ReasonForNullSetDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java index 2ab858b..440e79e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java @@ -21,7 +21,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, public void copyToEntity(ReferentialLocale referentialLocale, SetSeineSchoolEstimateDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setSchoolEstimate(toEntityCollection(referentialLocale, dto.getSchoolEstimate(), SchoolEstimate.class, entity.getSchoolEstimate())); @@ -31,7 +31,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineSchoolEstimateDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setSchoolEstimate(toLinkedHashSetData(referentialLocale, entity.getSchoolEstimate(), SchoolEstimateDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java index b3b37cc..e4a0be8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java @@ -21,7 +21,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se public void copyToEntity(ReferentialLocale referentialLocale, SetSeineTargetCatchDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setTargetCatch(toEntityCollection(referentialLocale, dto.getTargetCatch(), TargetCatch.class, entity.getTargetCatch())); @@ -31,7 +31,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineTargetCatchDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setTargetCatch(toLinkedHashSetData(referentialLocale, entity.getTargetCatch(), TargetCatchDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java index 71f2b40..cd23436 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java @@ -34,7 +34,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineDto dto, TripLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartDate(dto.getStartDate()); @@ -58,7 +58,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartDate(entity.getStartDate()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java index 80148c1..fb991b8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java @@ -21,7 +21,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineGearUseDto dto, TripLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setGearUseFeaturesLongline(toEntitySet(referentialLocale, dto.getGearUseFeaturesLongline(), GearUseFeaturesLongline.class, entity.getGearUseFeaturesLongline())); @@ -31,7 +31,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineGearUseDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setGearUseFeaturesLongline(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesLongline(), GearUseFeaturesLonglineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java index eeb6ca6..aa547e1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java @@ -32,7 +32,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> public void copyToEntity(ReferentialLocale referentialLocale, TripSeineDto dto, TripSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartDate(dto.getStartDate()); @@ -58,7 +58,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartDate(entity.getStartDate()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java index 6c062fc..80b6054 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java @@ -21,7 +21,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip public void copyToEntity(ReferentialLocale referentialLocale, TripSeineGearUseDto dto, TripSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setGearUseFeaturesSeine(toEntityCollection(referentialLocale, dto.getGearUseFeaturesSeine(), GearUseFeaturesSeine.class, entity.getGearUseFeaturesSeine())); @@ -31,7 +31,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineGearUseDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setGearUseFeaturesSeine(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesSeine(), GearUseFeaturesSeineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java index fc4a30b..6f00bea 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -1,7 +1,7 @@ package fr.ird.observe.services.binder.referential; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.I18nReferentialEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.BinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; @@ -17,7 +17,7 @@ import java.io.Serializable; * * @author Tony Chemit - chemit@codelutin.com */ -public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D extends ReferentialDto> extends BinderSupport<E, D> { +public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntity, D extends ReferentialDto> extends BinderSupport<E, D> { protected final ReferenceSetDefinition<D> definition; @@ -40,7 +40,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte reference.setCreateDate(entity.getTopiaCreateDate()); reference.setVersion(entity.getTopiaVersion()); - reference.setLastUpdate(entity.getLastUpdate()); + reference.setLastUpdate(entity.getLastUpdateDate()); reference.setEnabled(entity.isEnabled()); reference.setNeedComment(entity.isNeedComment()); @@ -94,7 +94,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyDtoI18nFieldsToEntity(I18nReferentialDto dto, I18nReferenceEntity entity) { + protected void copyDtoI18nFieldsToEntity(I18nReferentialDto dto, I18nReferentialEntity entity) { entity.setLabel1(dto.getLabel1()); entity.setLabel2(dto.getLabel2()); @@ -107,12 +107,12 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyDtoReferentialFieldsToEntity(ReferentialDto dto, ReferenceEntity entity) { + protected void copyDtoReferentialFieldsToEntity(ReferentialDto dto, ObserveReferentialEntity entity) { entity.setTopiaId(dto.getId()); entity.setStatus(REFERENCE_STATUS_TO_ENTITY.apply(dto.getStatus())); entity.setNeedComment(dto.isNeedComment()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setTopiaVersion(dto.getVersion()); entity.setTopiaCreateDate(dto.getCreateDate()); entity.setCode(dto.getCode()); @@ -120,13 +120,13 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyEntityReferentialFieldsToDto(ReferenceEntity entity, ReferentialDto dto) { + protected void copyEntityReferentialFieldsToDto(ObserveReferentialEntity entity, ReferentialDto dto) { dto.setId(entity.getTopiaId()); dto.setStatus(REFERENCE_STATUS_TO_DTO.apply(entity.getStatus())); dto.setEnabled(entity.isEnabled()); dto.setNeedComment(entity.isNeedComment()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setCode(entity.getCode()); @@ -134,7 +134,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyEntityI18nFieldsToDto(I18nReferenceEntity entity, I18nReferentialDto dto) { + protected void copyEntityI18nFieldsToDto(I18nReferentialEntity entity, I18nReferentialDto dto) { dto.setLabel2(entity.getLabel2()); dto.setLabel3(entity.getLabel3()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java index 25ee3d0..e623342 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java @@ -12,10 +12,10 @@ import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Persons; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.Vessels; @@ -188,7 +188,7 @@ public class EntitiesSetFactory { if (Entities.isReferentielClass(propertyType)) { // On veut tous les référentiels sauf ceux qui sont désactivés - entitiesExtractor = new EntitiesExtractor<>(propertyType, (Predicate<C>) ReferenceEntities.newEnablePredicate()); + entitiesExtractor = new EntitiesExtractor<>(propertyType, (Predicate<C>) ObserveReferentialEntities.newEnablePredicate()); } else { @@ -207,14 +207,14 @@ public class EntitiesSetFactory { return parentType.getName() + "#" + propertyName; } - protected <P extends TopiaEntity, C extends ReferenceEntity> void registerReferentialEntitiesExtractor( + protected <P extends TopiaEntity, C extends ObserveReferentialEntity> void registerReferentialEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName, Class<C> propertyType, Predicate<C> filter) { - filter = Predicates.and(filter, ReferenceEntities.newEnablePredicate()); + filter = Predicates.and(filter, ObserveReferentialEntities.newEnablePredicate()); EntitiesExtractor<C> entitiesExtractor = new EntitiesExtractor<>(propertyType, filter); registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java index 77b4111..12694cd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java @@ -1,7 +1,7 @@ package fr.ird.observe.services.entity; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.referentiel.ReferenceEntities; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.referentiel.SpeciesListTopiaDao; @@ -21,7 +21,7 @@ public class SpeciesListEntitiesExtractor extends EntitiesExtractor<Species> { protected final String speciesListId; public SpeciesListEntitiesExtractor(String speciesListId) { - super(Species.class, ReferenceEntities.<Species>newEnablePredicate()); + super(Species.class, ObserveReferentialEntities.<Species>newEnablePredicate()); this.speciesListId = speciesListId; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 0af61c7..c2a5831 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.BinderEngine; @@ -66,7 +66,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferentialReferenceSet<D> getReferenceSet(Class<D> type, Date lastUpdateDate) { - Class<ReferenceEntity> entityType = BinderEngine.get().getReferentialEntityType(type); + Class<ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(type); //FIXME A revoir car on devrait toujours avoir une date de dernière mise à jour Optional<Date> lastUpdateOptional = getLastUpdate(entityType); @@ -75,7 +75,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe if (lastUpdateOptional.isPresent() && (lastUpdateDate == null || lastUpdateOptional.get().after(lastUpdateDate))) { - List<ReferenceEntity> entities = loadEntities(entityType); + List<ObserveReferentialEntity> entities = loadEntities(entityType); result = toReferentialReferenceSet(type, entities, lastUpdateOptional.get()); @@ -125,14 +125,14 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> dtoType, String id) { - ReferenceEntity entity = loadEntity(dtoType, id); + ObserveReferentialEntity entity = loadEntity(dtoType, id); //FIXME Definir une definition pour chaque formulaire de référentiel Form<D> form = referentialEntityToForm(dtoType, entity, null); D dto = form.getObject(); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); dto.setEnabled(entity.isEnabled()); @@ -143,8 +143,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferentialReference<D> loadReference(Class<D> type, String id) throws DataNotFoundException { - ReferenceEntity entity = loadEntity(type, id); - ReferentialBinderSupport<ReferenceEntity, D> referentialBinder = getReferentialBinder(type); + ObserveReferentialEntity entity = loadEntity(type, id); + ReferentialBinderSupport<ObserveReferentialEntity, D> referentialBinder = getReferentialBinder(type); ReferentialReference<D> reference = referentialBinder.toReferentialReference(getReferentialLocale(), entity); return reference; @@ -152,8 +152,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> Form<D> preCreate(Class<D> dtoType) { - Class<ReferenceEntity> entityType = getReferentialEntityType(dtoType); - ReferenceEntity entity = newEntity(entityType); + Class<ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); + ObserveReferentialEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser //FIXME Definir une definition pour chaque formulaire de référentiel Form<D> form = referentialEntityToForm(dtoType, entity, null); @@ -162,9 +162,9 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> SaveResultDto save(D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); - Class<ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); - ReferenceEntity entity = loadOrCreateEntityFromReferentialDto(dto); + ObserveReferentialEntity entity = loadOrCreateEntityFromReferentialDto(dto); copyReferentialDtoToEntity(dto, entity); @@ -176,13 +176,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); deleteEntity(dtoType, entityType, Collections.singleton(id)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); deleteEntity(dtoType, entityType, ids); } @@ -190,11 +190,11 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <R extends ReferentialDto> DtoMap findAllUsages(R bean) throws DataNotFoundException { Class<R> referentialDtoType = (Class<R>) bean.getClass(); - Class<ReferenceEntity> entityType = getReferentialEntityType(referentialDtoType); + Class<ObserveReferentialEntity> entityType = getReferentialEntityType(referentialDtoType); - ReferenceEntity entity = loadEntity(referentialDtoType, bean.getId()); + ObserveReferentialEntity entity = loadEntity(referentialDtoType, bean.getId()); - TopiaDao<ReferenceEntity> dao = getTopiaPersistenceContext().getDao(entityType); + TopiaDao<ObserveReferentialEntity> dao = getTopiaPersistenceContext().getDao(entityType); EntityMap allUsages = new EntityMap(dao.findAllUsages(entity)); Set<AbstractReferenceSet<?, ?>> result = new LinkedHashSet<>(allUsages.size()); @@ -204,7 +204,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe List<? extends TopiaEntity> entities = allUsages.get(type); - if (ReferenceEntity.class.isAssignableFrom(type)) { + if (ObserveReferentialEntity.class.isAssignableFrom(type)) { Class<ReferentialDto> dtoType = BINDER_ENGINE.getReferentialDtoType((Class) type); @@ -228,7 +228,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> boolean exists(Class<D> dtoType, String id) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); return existsEntity(entityType, id); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java index 6ab985e..9952c19 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Maps; import fr.ird.observe.AbstractObserveTopiaDao; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.data.DataBinderSupport; @@ -81,12 +81,12 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer Class<? extends ReferentialDto> dtoType = (Class<? extends ReferentialDto>) type; - ReferentialBinderSupport<ReferenceEntity, ? extends ReferentialDto> binder = getReferentialBinder(dtoType); + ReferentialBinderSupport<ObserveReferentialEntity, ? extends ReferentialDto> binder = getReferentialBinder(dtoType); List<TopiaEntity> universe = executeRequest(hql, vars); for (TopiaEntity entity : universe) { - ReferentialReference<? extends ReferentialDto> reference = binder.toReferentialReference(getReferentialLocale(), (ReferenceEntity) entity); + ReferentialReference<? extends ReferentialDto> reference = binder.toReferentialReference(getReferentialLocale(), (ObserveReferentialEntity) entity); values.add(reference); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java index 38ea537..6f60048 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.gson.Gson; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.IdDto; @@ -76,7 +76,7 @@ public class GenerateValidatorDescriptorsFileTool { NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); - for (Map.Entry<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> entry : BinderEngine.get().getReferentialEntityToDtoTypes().entrySet()) { + for (Map.Entry<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> entry : BinderEngine.get().getReferentialEntityToDtoTypes().entrySet()) { Class<? extends TopiaEntity> entityType = entry.getKey(); Class<? extends IdDto> dtoType = entry.getValue(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java index c916706..c22bc47 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java @@ -28,7 +28,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -120,7 +120,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat for (Class<? extends TopiaEntity> entityType : detector.getDetectedEntityTypes()) { - if (ReferenceEntity.class.isAssignableFrom(entityType)) { + if (ObserveReferentialEntity.class.isAssignableFrom(entityType)) { buildResultForReferentialDtoType((Class) entityType, detector, forDtoTypeBuilder); } else { buildResultForDataDtoType((Class) entityType, detector, forDtoTypeBuilder); @@ -133,9 +133,9 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - private <E extends ReferenceEntity, D extends ReferentialDto> void buildResultForReferentialDtoType(Class<E> entityType, - ValidationMessageDetector detector, - ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { + private <E extends ObserveReferentialEntity, D extends ReferentialDto> void buildResultForReferentialDtoType(Class<E> entityType, + ValidationMessageDetector detector, + ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { ImmutableSet.Builder<ValidateResultForDto<D>> validateResultForDtoMapBuilder = new ImmutableSet.Builder<>(); @@ -143,7 +143,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat for (Map.Entry<TopiaEntity, Collection<ValidationMessage>> entry : detectedMessages.entrySet()) { TopiaEntity entity = entry.getKey(); - ReferentialReference<D> referenceDto = BINDER_ENGINE.transformEntityToReferentialReferenceDto(serviceContext.getReferentialLocale(), (ReferenceEntity) entity); + ReferentialReference<D> referenceDto = BINDER_ENGINE.transformEntityToReferentialReferenceDto(serviceContext.getReferentialLocale(), (ObserveReferentialEntity) entity); Collection<ValidationMessage> validationMessages = entry.getValue(); ValidateResultForDto<D> validateResultForDto = new ValidateResultForDto<>(referenceDto, ImmutableSet.copyOf(validationMessages)); validateResultForDtoMapBuilder.add(validateResultForDto); @@ -181,7 +181,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - protected <D extends ReferentialDto, E extends ReferenceEntity> void validateReferential(Class<D> referentialDtoType, ValidationMessageDetector detector) { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> void validateReferential(Class<D> referentialDtoType, ValidationMessageDetector detector) { Class<E> referentialType = getReferentialEntityType(referentialDtoType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java index df98b9c..349756a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java @@ -25,7 +25,7 @@ public class BranchlineServiceTopia extends ObserveServiceTopia implements Branc Branchline entity = loadEntity(BranchlineDto.class, id); Form<BranchlineDto> form = dataEntityToForm(BranchlineDto.class, entity, ReferenceSetRequestDefinitions.BRANCHLINE_FORM); - form.getObject().setLastUpdate(setLongline.getLastUpdate()); + form.getObject().setLastUpdate(setLongline.getLastUpdateDate()); return form; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java index 431551b..89db270 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.entities.referentiel; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; @@ -35,7 +34,6 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.Set; /** * Test de la classe {@link LengthWeightParameters}. @@ -48,14 +46,8 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { /** Logger */ private static final Log log = LogFactory.getLog(LengthWeightParemetersTest.class); - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of("testGetCorrectLengthWeightParameter"); - } - - @Override - public String getScriptName() { - return "referentiel"; + public LengthWeightParemetersTest() { + super("referentiel", "testGetCorrectLengthWeightParameter"); } private ObserveTopiaPersistenceContext persistenceContext; @@ -133,7 +125,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { entity.setCoefficients("a=3.8E-5:b=2.78"); entity.setLengthWeightFormula("a * Math.pow(L, b)"); entity.setWeightLengthFormula("Math.pow(P/a, 1/b)"); - entity.setLastUpdate(new Date()); + entity.setLastUpdateDate(new Date()); lengthWeightParameterDao.create(entity); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index e458270..23b0316 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -23,6 +23,7 @@ package fr.ird.observe.services; */ import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteStreams; import com.google.common.io.Resources; import fr.ird.observe.ObserveTopiaApplicationContext; @@ -74,10 +75,10 @@ public class DataSourceResource implements TestRule { protected ObserveReferentialCache referentialCache; - public DataSourceResource(ApplicationContextResource applicationContextResource, Set<String> testNamesChangeDataBase, String scriptName) { + public DataSourceResource(ApplicationContextResource applicationContextResource, String scriptName, String... testNamesChangeDataBase) { this.applicationContextResource = applicationContextResource; - this.testNamesChangeDataBase = testNamesChangeDataBase; this.scriptName = scriptName; + this.testNamesChangeDataBase = ImmutableSet.<String>builder().add(testNamesChangeDataBase).build(); } public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java index 2c51a58..ff73bfd 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java @@ -3,9 +3,9 @@ package fr.ird.observe.services.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.LastUpdateType; +import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.TdrRecord; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; @@ -41,7 +41,7 @@ public class BinderEngineMetadataTest { binderEngine = BinderEngine.get(); for (Class<? extends ReferentialDto> dtoType : binderEngine.getReferentialDtoToEntityTypes().keySet()) { - ReferentialBinderSupport<ReferenceEntity, ? extends ReferentialDto> referentialBinder = binderEngine.getReferentialBinder(dtoType); + ReferentialBinderSupport<ObserveReferentialEntity, ? extends ReferentialDto> referentialBinder = binderEngine.getReferentialBinder(dtoType); Assert.assertNotNull(referentialBinder); } @@ -58,18 +58,18 @@ public class BinderEngineMetadataTest { @Test public void testGetReferentialEntityType() throws Exception { - ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); + ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); Assert.assertEquals(59, referentialDtoToEntityTypes.size()); - Set<Class<? extends ReferenceEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); - Set<Class<? extends ReferenceEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); + Set<Class<? extends ObserveReferentialEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); + Set<Class<? extends ObserveReferentialEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); Assert.assertEquals(referentialEntityTypesFromTopia.size(), entityTypesFromEngine.size()); for (Class<? extends ReferentialDto> dtoType : referentialDtoToEntityTypes.keySet()) { - Class<? extends ReferenceEntity> entityType = binderEngine.getReferentialEntityType(dtoType); + Class<? extends ObserveReferentialEntity> entityType = binderEngine.getReferentialEntityType(dtoType); Assert.assertNotNull(entityType); } @@ -99,12 +99,12 @@ public class BinderEngineMetadataTest { @Test public void testGetReferentialDtoType() throws Exception { - ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); + ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); Assert.assertEquals(2 * 59, referentialDtoToEntityTypes.size()); - for (Class<? extends ReferenceEntity> entityType : referentialDtoToEntityTypes.keySet()) { + for (Class<? extends ObserveReferentialEntity> entityType : referentialDtoToEntityTypes.keySet()) { Class<? extends ReferentialDto> dtoType = binderEngine.getReferentialDtoType(entityType); Assert.assertNotNull(dtoType); @@ -130,16 +130,16 @@ public class BinderEngineMetadataTest { } - protected Set<Class<? extends ReferenceEntity>> getReferentialEntityTypes() { + protected Set<Class<? extends ObserveReferentialEntity>> getReferentialEntityTypes() { - Set<Class<? extends ReferenceEntity>> result = new LinkedHashSet<>(); + Set<Class<? extends ObserveReferentialEntity>> result = new LinkedHashSet<>(); for (ObserveEntityEnum observeEntityEnum : ObserveEntityEnum.values()) { Class<? extends TopiaEntity> contract = observeEntityEnum.getContract(); - if (ReferenceEntity.class.isAssignableFrom(contract) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { + if (ObserveReferentialEntity.class.isAssignableFrom(contract) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { - result.add((Class<? extends ReferenceEntity>) contract); + result.add((Class<? extends ObserveReferentialEntity>) contract); } } return result; @@ -152,12 +152,11 @@ public class BinderEngineMetadataTest { for (ObserveEntityEnum observeEntityEnum : ObserveEntityEnum.values()) { - if (!ReferenceEntity.class.isAssignableFrom(observeEntityEnum.getContract()) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { + if (ObserveDataEntity.class.isAssignableFrom(observeEntityEnum.getContract()) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { result.add(observeEntityEnum.getContract()); } } - result.remove(LastUpdateType.class); result.remove(TdrRecord.class); return result; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java index c4e7205..7191477 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java @@ -1,8 +1,7 @@ package fr.ird.observe.services.binder; -import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -133,7 +132,6 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; -import java.util.Set; /** * Created on 26/11/15. @@ -147,6 +145,10 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { private BinderEngine binderEngine; + public BinderEngineTest() { + super("dataForTestSeine"); + } + @Override @Before public void setUp() throws Exception { @@ -283,16 +285,6 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { } - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; - } - protected <D extends DataDto, E extends TopiaEntity> void transformDataEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Class<E> entityType = binderEngine.getDataEntityType(dtoType); @@ -329,7 +321,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { } - protected <D extends ReferentialDto, E extends ReferenceEntity> void transformReferentialEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> void transformReferentialEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Class<E> entityType = binderEngine.getReferentialEntityType(dtoType); @@ -349,7 +341,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Assert.assertEquals(entity.getTopiaId(), dto.getId()); Assert.assertEquals(entity.getTopiaCreateDate(), dto.getCreateDate()); Assert.assertEquals(entity.getTopiaVersion(), dto.getVersion()); - Assert.assertEquals(entity.getLastUpdate(), dto.getLastUpdate()); + Assert.assertEquals(entity.getLastUpdateDate(), dto.getLastUpdate()); Assert.assertEquals(entity.isNeedComment(), dto.isNeedComment()); Assert.assertEquals(entity.isEnabled(), dto.isEnabled()); Assert.assertEquals(entity.getUri(), dto.getUri()); @@ -361,7 +353,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Assert.assertEquals(entity.getTopiaId(), entity.getTopiaId()); Assert.assertEquals(entity.getTopiaCreateDate(), entity.getTopiaCreateDate()); Assert.assertEquals(entity.getTopiaVersion(), entity.getTopiaVersion()); - Assert.assertEquals(entity.getLastUpdate(), entity.getLastUpdate()); + Assert.assertEquals(entity.getLastUpdateDate(), entity.getLastUpdateDate()); Assert.assertEquals(entity.isNeedComment(), entity.isNeedComment()); Assert.assertEquals(entity.isEnabled(), entity.isEnabled()); Assert.assertEquals(entity.getUri(), entity.getUri()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java index 68753aa..ed8c194 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.service; * #L% */ +import fr.ird.observe.AbstractObserveTopiaDao; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.LastUpdateType; -import fr.ird.observe.entities.LastUpdateTypeTopiaDao; +import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.services.ApplicationContextResource; import fr.ird.observe.services.DataSourceResource; @@ -42,13 +42,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.FileUtil; import java.io.File; import java.nio.file.Files; import java.util.Date; -import java.util.Set; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -68,13 +66,22 @@ public abstract class AbstractServiceTopiaTest { private static final Log log = LogFactory.getLog(AbstractServiceTopiaTest.class); - @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, getTestNamesChangeDataBase(), getScriptName()); + protected AbstractServiceTopiaTest(String scriptName, String... testNamesChangeDataBase) { + this.scriptName = scriptName; + this.testNamesChangeDataBase = testNamesChangeDataBase; + this.dataSourceResource = new DataSourceResource(applicationContextResource, this.scriptName, this.testNamesChangeDataBase); + } - public abstract Set<String> getTestNamesChangeDataBase(); + private final String scriptName; - public abstract String getScriptName(); + private final String[] testNamesChangeDataBase; + + @Rule + public final DataSourceResource dataSourceResource; + protected DataSourceResource newDataSourceResource(String scriptName, String... testNamesChangeDataBase) { + return new DataSourceResource(applicationContextResource, scriptName, testNamesChangeDataBase); + } @Before public void setUp() throws Exception { @@ -87,13 +94,13 @@ public abstract class AbstractServiceTopiaTest { if (!dataBaseCommonRefDirectory.isDirectory()) { if (log.isInfoEnabled()) { - log.info("create Database on " + dataBaseDirectory + " from script " + getScriptName()); + log.info("create Database on " + dataBaseDirectory + " from script " + scriptName); } Files.createDirectories(dataBaseDirectory.toPath()); // Create database from script - String scriptPath = applicationContextResource.getScriptPath(getScriptName(), H2DataSourceMigration.V_4_0_1); + String scriptPath = applicationContextResource.getScriptPath(scriptName, H2DataSourceMigration.V_4_0_1); dataSourceResource.createCommonsDataSourceFromScript(scriptPath); } @@ -131,7 +138,7 @@ public abstract class AbstractServiceTopiaTest { } - protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferentialReference referenceDto) { + protected void assertEntityEqualsReferenceDto(ObserveEntity entity, ReferentialReference referenceDto) { if (entity == null) { Assert.assertNull(referenceDto); } else { @@ -140,7 +147,7 @@ public abstract class AbstractServiceTopiaTest { } - protected void assertReferenceDtoEqualsEntity(ReferentialReference referenceDto, TopiaEntity entity) { + protected void assertReferenceDtoEqualsEntity(ReferentialReference referenceDto, ObserveEntity entity) { if (referenceDto == null) { Assert.assertNull(entity); } else { @@ -151,12 +158,8 @@ public abstract class AbstractServiceTopiaTest { protected Date getLastUpdate(Class entityType) { ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); - - LastUpdateTypeTopiaDao dao = persistenceContext.getLastUpdateTypeDao(); - - LastUpdateType lastUpdateType = dao.forTypeEquals(entityType.getCanonicalName()).findUnique(); - - return lastUpdateType.getLastUpdate(); + AbstractObserveTopiaDao dao = (AbstractObserveTopiaDao) persistenceContext.getDao(entityType); + return dao.getLastUpdateDate(); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java index 1286cf0..6f69f91 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import java.util.Set; +import java.io.File; /** * Created on 26/08/15. @@ -41,14 +41,8 @@ public class DataSourceDumpProducerServiceTopiaTest extends AbstractServiceTopia protected DataSourceDumpProducerService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public DataSourceDumpProducerServiceTopiaTest() { + super("dataForTestSeine"); } @Before @@ -66,7 +60,6 @@ public class DataSourceDumpProducerServiceTopiaTest extends AbstractServiceTopia } - @Test public void testGetDataDump() throws Exception { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index 8ba9cee..5a811df 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -51,7 +51,7 @@ import java.util.Date; * Created on 23/08/15. * * @author Tony Chemit - chemit@codelutin.com - * FIXME IT tests + * FIXME IT tests */ @Ignore public class DataSourceServiceTopiaTest { @@ -59,19 +59,19 @@ public class DataSourceServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); - public static final ImmutableSet<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableSet.of( + public static final String[] TEST_NAMES_CHANGE_DATA_BASE = new String[]{ "testOpenNotExistingDatabase", "testOpen", "testCreateEmptyDataSource", "testCreateDataSourceFromImportDatabase", "testCreateDataSourceFromImportReferential", - "testCreateDataSourceFromImportReferentialAndData"); + "testCreateDataSourceFromImportReferentialAndData"}; /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceServiceTopiaTest.class); @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE, "dataSourceTest"); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, "dataSourceTest", TEST_NAMES_CHANGE_DATA_BASE); protected DataSourceService service; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java new file mode 100644 index 0000000..e910486 --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java @@ -0,0 +1,98 @@ +package fr.ird.observe.services.service; + +import com.google.common.base.Preconditions; +import fr.ird.observe.services.ApplicationContextResource; +import fr.ird.observe.services.DataSourceResource; +import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.nio.file.Files; + +/** + * Created on 25/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Ignore +public class MigrateTestsDatabases { + + @ClassRule + public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + + public static final String FROM_VERSION = "4.0.1"; + + public static final String TO_VERSION = "5.0"; + + /** Logger. */ + private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class); + + @Rule + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, "taiste"); + + @Test + public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + migrateReferentielDb(FROM_VERSION, TO_VERSION, "referentiel"); + } + + @Test + public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + migrateReferentielDb(FROM_VERSION, TO_VERSION, "dataForTestSeine"); + } + + @Test + public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + migrateReferentielDb(FROM_VERSION, TO_VERSION, "dataForTestLongline"); + } + + protected void migrateReferentielDb(String fromVersion, String toVersion, String databaseName) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + + String sqlFilename = databaseName + ".sql.gz"; + String scriptPath = "/db/" + fromVersion + "/" + sqlFilename; + + URL url = getClass().getResource(scriptPath); + + Preconditions.checkNotNull(url, "Could not find database at " + scriptPath); + + File databasesRootDirectory = new File(url.getFile()); + + while (!"observe-test-data".equals(databasesRootDirectory.getName())) { + databasesRootDirectory = databasesRootDirectory.getParentFile(); + } + + File f = databasesRootDirectory + .toPath() + .resolve("src") + .resolve("main") + .resolve("resources") + .resolve("db") + .resolve(toVersion) + .resolve(sqlFilename) + .toFile(); + + if (log.isInfoEnabled()) { + log.info("Will generate " + databaseName + " to " + f); + } + + Files.createDirectories(f.toPath().getParent()); + + dataSourceResource.createDataSourceFromScript(scriptPath); + + DataSourceDumpProducerService service = applicationContextResource.newService(dataSourceResource.getDataSourceConfiguration(), DataSourceDumpProducerService.class); + + byte[] allDataDump = service.getAllDataDump(); + + FileUtils.writeByteArrayToFile(f, allDataDump); + + } + +} diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index f75da3c..7791249 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -22,11 +22,10 @@ package fr.ird.observe.services.service; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ReferenceEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; @@ -41,7 +40,6 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Date; -import java.util.Set; /** * Created on 16/08/15. @@ -55,14 +53,8 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { protected ReferentialService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of("testDelete"); - } - - @Override - public String getScriptName() { - return "referentiel"; + public ReferentialServiceTopiaTest() { + super("referentiel", "testDelete"); } @Override @@ -96,7 +88,7 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { } - protected <D extends ReferentialDto, E extends ReferenceEntity> void loadToEdit(ObserveTopiaPersistenceContext persistenceContext, Class<D> dtoType) { + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> void loadToEdit(ObserveTopiaPersistenceContext persistenceContext, Class<D> dtoType) { Class<E> entityType = BinderEngine.get().getReferentialEntityType(dtoType); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java index 68315d3..cfb845c 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java @@ -29,7 +29,6 @@ import org.junit.Assert; import org.junit.Test; import java.util.List; -import java.util.Set; /** * Created on 29/08/15. @@ -40,14 +39,8 @@ public class ConsolidateDataServiceTopiaTest extends AbstractServiceTopiaTest { protected ConsolidateDataService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of("testConsolidateTripSeines"); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public ConsolidateDataServiceTopiaTest() { + super("dataForTestSeine", "testConsolidateTripSeines"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java index f7f8196..1c367fc 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.actions.report; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.actions.report.DataMatrix; @@ -41,7 +40,6 @@ import java.net.URL; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; /** * Classe abstraite de test d'un report. @@ -65,17 +63,11 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi /** Le report à tester. */ private Report report; - protected abstract String getReportId(); - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public AbstractReportServiceTopiaTest() { + super("dataForTestSeine"); } - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } + protected abstract String getReportId(); @Before public final void setUp() throws Exception { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java index 69d07e3..b651473 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java @@ -32,8 +32,6 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.validator.NuitonValidatorScope; -import java.util.Set; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -41,14 +39,8 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { protected ValidateService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public ValidateServiceTopiaTest() { + super("dataForTestSeine"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index 88a6c1e..8708235 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; @@ -44,8 +43,6 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; -import java.util.Set; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -55,15 +52,8 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic public static final String SET_LONGLINE_ID = "fr.ird.observe.entities.longline.SetLongline#1429538714446#0.0876020351424813"; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of( - "saveTest"); - } - - @Override - public String getScriptName() { - return "dataForTestLongline"; + public SetLonglineDetailCompositionServiceTopiaTest() { + super("dataForTestLongline", "saveTest"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java index 001be0a..7c9b507 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; @@ -30,8 +29,6 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; -import java.util.Set; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -39,14 +36,8 @@ public class RouteServiceTopiaTest extends AbstractServiceTopiaTest{ protected RouteService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public RouteServiceTopiaTest() { + super("dataForTestSeine"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java index dfb2fee..952ea0a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java @@ -22,15 +22,12 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import org.junit.Assert; import org.junit.Test; -import java.util.Set; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,14 +37,8 @@ public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest { protected TargetSampleService service; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public TargetSampleServiceTopiaTest() { + super("dataForTestSeine"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java index ad6bd6f..be0e4fa 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; @@ -38,8 +37,6 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntities; -import java.util.Set; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -51,17 +48,10 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { public static final String GEAR_USE_FEATURES_SEINE_ID = "fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216"; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of( - "saveCreateTest", - "saveUpdateTest", - "deleteTest"); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public TripSeineGearUseServiceTopiaTest() { + super("dataForTestSeine", "saveCreateTest", + "saveUpdateTest", + "deleteTest"); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index bb9a2a3..d3c2096 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.DataReference; @@ -47,7 +46,6 @@ import org.nuiton.util.DateUtil; import java.util.Calendar; import java.util.Date; -import java.util.Set; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -58,17 +56,10 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { protected ReferentialService referentialService; - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of( - "saveCreateTest", - "saveUpdateTest", - "deleteTest"); - } - - @Override - public String getScriptName() { - return "dataForTestSeine"; + public TripSeineServiceTopiaTest() { + super("dataForTestSeine", "saveCreateTest", + "saveUpdateTest", + "deleteTest"); } @Override @@ -141,7 +132,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getFormsUrl(), tripSeineDto.getFormsUrl()); Assert.assertEquals(tripSeine.getReportsUrl(), tripSeineDto.getReportsUrl()); Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); - Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); + Assert.assertEquals(tripSeine.getLastUpdateDate(), tripSeineDto.getLastUpdate()); loadReferenceSets(referentialService, form); @@ -236,7 +227,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); - Assert.assertNotNull(tripSeine.getLastUpdate()); + Assert.assertNotNull(tripSeine.getLastUpdateDate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); @@ -288,8 +279,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); - Assert.assertNotNull(tripSeine.getLastUpdate()); - Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdate()); + Assert.assertNotNull(tripSeine.getLastUpdateDate()); + Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdateDate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); diff --git a/observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz b/observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz new file mode 100644 index 0000000..94eb000 Binary files /dev/null and b/observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz b/observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz new file mode 100644 index 0000000..d4fad8e Binary files /dev/null and b/observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz differ diff --git a/pom.xml b/pom.xml index 471860c..e756b9f 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>5.0.1</observe.model.version> + <observe.model.version>5.0-2</observe.model.version> </properties> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm