September 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] [SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce - Closes #1374
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e4cc531a by tchemit at 2019-09-12T10:46:48Z [SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce - Closes #1374 - - - - - 3 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java ===================================== @@ -55,12 +55,14 @@ public class ReferentialSynchronizeServiceLocal extends ObserveServiceLocal impl byte[] insertSqlCode = oppositeSqlsRequest.getInsertSqlCode(); byte[] insertAssociationSqlCode = oppositeSqlsRequest.getInsertAssociationSqlCode(); byte[] updateSqlCode = oppositeSqlsRequest.getUpdateSqlCode(); + byte[] updateAssociationSqlCode = oppositeSqlsRequest.getUpdateAssociationSqlCode(); byte[] deleteSqlCode = request.getDeleteSqlCode(); byte[] desactivateSqlCode = request.getDesactivateSqlCode(); getTopiaPersistenceContext().executeSqlScripts(deleteAssociationSqlCode, insertSqlCode, insertAssociationSqlCode, updateSqlCode, + updateAssociationSqlCode, desactivateSqlCode, deleteSqlCode); timeLog.log(startTime, "executeSqlsRequests"); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== @@ -158,7 +158,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { String id = referentialDto.getId(); for (TopiaMetadataAssociation association : associations) { // On commence toujours par supprimer toutes les anciennes associations, elles seront ré-ajoutées juste après - String deleteSql = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + String deleteSql = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id); result.add(TopiaSqlStatements.boxAssociationStatement(deleteSql)); Collection<ReferentialDtoReference<?, ?>> associationValues = binder.obtainSourceProperty(referentialDto, association.getTargetPropertyName()); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java ===================================== @@ -40,6 +40,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private final byte[] insertAssociationSqlCode; private final byte[] insertSqlCode; private final byte[] updateSqlCode; + private final byte[] updateAssociationSqlCode; private final byte[] deleteAssociationSqlCode; private final byte[] deleteSqlCode; private final byte[] desactivateSqlCode; @@ -47,12 +48,14 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private ReferentialSynchronizeSqlsRequest(String insertSqlCode, String insertAssociationSqlCode, String updateSqlCode, + String updateAssociationSqlCode, String deleteSqlCode, String deleteAssociationSqlCode, String desactivateSqlCode) { this.insertSqlCode = insertSqlCode.getBytes(); this.insertAssociationSqlCode = insertAssociationSqlCode.getBytes(); this.updateSqlCode = updateSqlCode.getBytes(); + this.updateAssociationSqlCode= updateAssociationSqlCode.getBytes(); this.deleteSqlCode = deleteSqlCode.getBytes(); this.deleteAssociationSqlCode = deleteAssociationSqlCode.getBytes(); this.desactivateSqlCode = desactivateSqlCode.getBytes(); @@ -78,6 +81,10 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { return insertAssociationSqlCode; } + public byte[] getUpdateAssociationSqlCode() { + return updateAssociationSqlCode; + } + public byte[] getDeleteAssociationSqlCode() { return deleteAssociationSqlCode; } @@ -91,6 +98,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private final StringBuilder addAssociationTasksBuilder = new StringBuilder(); private final StringBuilder addTasksBuilder = new StringBuilder(); private final StringBuilder updateTasksBuilder = new StringBuilder(); + private final StringBuilder updateAssociationTasksBuilder = new StringBuilder(); private final StringBuilder deleteTasksBuilder = new StringBuilder(); private final StringBuilder deleteAssociationTasksBuilder = new StringBuilder(); private final StringBuilder desactivateTasksBuilder = new StringBuilder(); @@ -99,6 +107,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { return new ReferentialSynchronizeSqlsRequest(addTasksBuilder.toString(), addAssociationTasksBuilder.toString(), updateTasksBuilder.toString(), + updateAssociationTasksBuilder.toString(), deleteTasksBuilder.toString(), deleteAssociationTasksBuilder.toString(), desactivateTasksBuilder.toString()); @@ -116,7 +125,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { public Builder addUpdateStatement(String sql) { log.info("Add update sql: " + sql); - updateTasksBuilder.append(sql); + if (sql.startsWith(TopiaSqlStatements.ASSOCIATION_STATEMENT_PREFIX)) { + updateAssociationTasksBuilder.append(TopiaSqlStatements.unboxAssociationStatement(sql)); + } else { + updateTasksBuilder.append(sql); + } return this; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4cc531a2f3a3f940b4bdf5bfa3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4cc531a2f3a3f940b4bdf5bfa3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL] Une marée provoque un dépassement mémoire et/ou a un souci de...
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f6aba918 by tchemit at 2019-09-12T10:45:53Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 10 changed files: - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql - pom.xml - + test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.2/empty_h2.sql.gz - + test/src/main/resources/db/7.2/empty_pg.sql.gz - + test/src/main/resources/db/7.2/referentiel.sql.gz - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java ===================================== @@ -0,0 +1,43 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +(a)AutoService(MigrationVersionResource.class) +public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_2() { + super(Versions.valueOf("7.2")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + executor.addScript("01", "fix_trip_longline_comment"); + } + +} + ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment; +ALTER TABLE observe_longline.trip ALTER COLUMN comment2 RENAME TO comment; ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment CASCADE; +ALTER TABLE observe_longline.trip RENAME comment2 TO comment; ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.1</observe.model.version> + <observe.model.version>7.2</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -100,12 +100,10 @@ observe.common.IdDto.quadrant observe.common.IdDto.sex observe.common.IdDto.sizeMeasureType observe.common.IdDto.species -observe.common.LengthLengthParameterDto.coefficients observe.common.LengthLengthParameterDto.inputOutputFormula observe.common.LengthLengthParameterDto.inputSizeMeasureType observe.common.LengthLengthParameterDto.outputInputFormula observe.common.LengthLengthParameterDto.outputSizeMeasureType -observe.common.LengthWeightParameterDto.coefficients observe.common.LengthWeightParameterDto.lengthWeightFormula observe.common.LengthWeightParameterDto.weightLengthFormula observe.common.NonTargetCatchDto.catchWeight View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f6aba918f6e74750abf91de8608… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f6aba918f6e74750abf91de8608… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL] Une marée provoque un dépassement mémoire et/ou a un souci de...
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5a81d27c by tchemit at 2019-09-12T10:27:45Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 9 changed files: - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql - pom.xml - + test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.2/empty_h2.sql.gz - + test/src/main/resources/db/7.2/empty_pg.sql.gz - + test/src/main/resources/db/7.2/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java ===================================== @@ -0,0 +1,43 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +(a)AutoService(MigrationVersionResource.class) +public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_2() { + super(Versions.valueOf("7.2")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + executor.addScript("01", "fix_trip_longline_comment"); + } + +} + ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment; +ALTER TABLE observe_longline.trip comment2 RENAME TO comment; ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment CASCADE; +ALTER TABLE observe_longline.trip RENAME comment2 TO comment; ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.1</observe.model.version> + <observe.model.version>7.2</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5a81d27c55d57599dcd75a348a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5a81d27c55d57599dcd75a348a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Une marée provoque un dépassement mémoire et/ou a un souci de...
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 98570c91 by tchemit at 2019-09-12T10:18:45Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 4 changed files: - persistence/src/main/resources/db/migration/8.0/104_create_ll_common_schema-common.sql - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== persistence/src/main/resources/db/migration/8.0/104_create_ll_common_schema-common.sql ===================================== @@ -41,7 +41,7 @@ CREATE TABLE ll_common.vesselactivity(topiaid VARCHAR(255) NOT NULL, topiaversio CREATE TABLE ll_common.weightcategory(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), CONSTRAINT pk_ll_common_weightcategory primary key(topiaid)); CREATE TABLE ll_common.weightdeterminationmethod(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), CONSTRAINT pk_ll_common_weightdeterminationmethod primary key(topiaid)); -CREATE TABLE ll_common.trip(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, observationscomment VARCHAR(255), startdate TIMESTAMP, enddate TIMESTAMP, homeid VARCHAR(255), observationmethod VARCHAR(255), observer VARCHAR(255), vessel VARCHAR(255), captain VARCHAR(255), observationsdataentryoperator VARCHAR(255), program VARCHAR(255), ocean VARCHAR(255), departureharbour VARCHAR(255), landingharbour VARCHAR(255), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, observationsdataquality VARCHAR(255), generalcomment VARCHAR(1025), triptype VARCHAR(255), ersid VARCHAR(255), noofcrewmembers INTEGER, observationsavailability BOOLEAN DEFAULT FALSE, logbookcomment VARCHAR(1025), logbookdataquality VARCHAR(255), logbookdataentryoperator VARCHAR(255), logbookavailability BOOLEAN DEFAULT FALSE, CONSTRAINT pk_ll_common_trip primary key(topiaid)); +CREATE TABLE ll_common.trip(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP, observationscomment VARCHAR(1025), startdate TIMESTAMP, enddate TIMESTAMP, homeid VARCHAR(255), observationmethod VARCHAR(255), observer VARCHAR(255), vessel VARCHAR(255), captain VARCHAR(255), observationsdataentryoperator VARCHAR(255), program VARCHAR(255), ocean VARCHAR(255), departureharbour VARCHAR(255), landingharbour VARCHAR(255), lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, observationsdataquality VARCHAR(255), generalcomment VARCHAR(1025), triptype VARCHAR(255), ersid VARCHAR(255), noofcrewmembers INTEGER, observationsavailability BOOLEAN DEFAULT FALSE, logbookcomment VARCHAR(1025), logbookdataquality VARCHAR(255), logbookdataentryoperator VARCHAR(255), logbookavailability BOOLEAN DEFAULT FALSE, CONSTRAINT pk_ll_common_trip primary key(topiaid)); CREATE TABLE ll_common.gearusefeatures(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP NOT NULL, trip VARCHAR(255), gear VARCHAR(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1025), usedintrip BOOLEAN, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, CONSTRAINT pk_ll_common_gearusefeatures primary key(topiaid)); CREATE TABLE ll_common.gearusefeaturesmeasurement(topiaid VARCHAR(255) NOT NULL, topiaversion BIGINT NOT NULL, topiacreatedate TIMESTAMP NOT NULL, gearcaracteristic VARCHAR(255) NOT NULL, gearusefeatures VARCHAR(255), measurementvalue VARCHAR(255) NOT NULL, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, CONSTRAINT pk_ll_common_gearusefeaturesmeasurement primary key(topiaid)); CREATE TABLE ll_common.species_trip(trip VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL); ===================================== test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/referentiel.sql.gz and b/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/98570c9112bb919e445b9d9815d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/98570c9112bb919e445b9d9815d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: let's pass if we could not load backups... this should not break application.
by Tony CHEMIT 11 Sep '19

11 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2949efae by tchemit at 2019-09-11T17:12:57Z let's pass if we could not load backups... this should not break application. - - - - - cb633b5e by tchemit at 2019-09-11T17:13:13Z expose clientconfig for tes and use it - - - - - bd3ee115 by tchemit at 2019-09-11T17:13:47Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - closes #1373 - - - - - 12 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client-runner/src/test/java/fr/ird/observe/client/simple/longline/LonglineDetailCompositionValidatorServiceTest.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql - + persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql - pom.xml - + test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.2/empty_h2.sql.gz - + test/src/main/resources/db/7.2/empty_pg.sql.gz - + test/src/main/resources/db/7.2/referentiel.sql.gz Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -164,7 +164,7 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre delegate.setConfigFileName(configFileName); } - static ClientConfig forTest() { + public static ClientConfig forTest() { return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); } ===================================== client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java ===================================== @@ -127,35 +127,34 @@ public class BackupsManager implements Closeable { this.backupsPath = backupsPath; this.checkBackups.start(); - try { - List<BackupStorage> backups; - if (Files.exists(storePath)) { - try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { - Type typeOfT = new TypeToken<List<BackupStorage>>() { - }.getType(); - backups = new Gson().fromJson(reader, typeOfT); - log.info(String.format("Loaded %d backups from %s", backups.size(), storePath)); - } - } else { + List<BackupStorage> backups; + if (Files.exists(storePath)) { + try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { + Type typeOfT = new TypeToken<List<BackupStorage>>() { + }.getType(); + backups = new Gson().fromJson(reader, typeOfT); + log.info(String.format("Loaded %d backups from %s", backups.size(), storePath)); + } catch (Exception e) { + log.error("can't load backups...", e); backups = new LinkedList<>(); } + } else { + backups = new LinkedList<>(); + } - Iterator<BackupStorage> iterator = backups.iterator(); - while (iterator.hasNext()) { - BackupStorage backupStorage = iterator.next(); - if (!backupStorage.exists()) { - iterator.remove(); - continue; - } - if (!backupStorage.isVerified()) { - iterator.remove(); - addAutomaticBackup(backupStorage.getFile().toPath()); - } + Iterator<BackupStorage> iterator = backups.iterator(); + while (iterator.hasNext()) { + BackupStorage backupStorage = iterator.next(); + if (!backupStorage.exists()) { + iterator.remove(); + continue; + } + if (!backupStorage.isVerified()) { + iterator.remove(); + addAutomaticBackup(backupStorage.getFile().toPath()); } - this.backups = backups; - } catch (IOException e) { - throw new ObserveSwingTechnicalException("Can't init backups manager", e); } + this.backups = backups; } private List<BackupStorage> discoverAutomaticBackups(Path backupsPath) throws IOException { ===================================== client-runner/src/test/java/fr/ird/observe/client/simple/longline/LonglineDetailCompositionValidatorServiceTest.java ===================================== @@ -71,7 +71,7 @@ public class LonglineDetailCompositionValidatorServiceTest { ObserveSwingApplicationContext.get().close(); } - ClientConfig config = new ClientConfig(); + ClientConfig config = ClientConfig.forTest(); config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application)); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java ===================================== @@ -0,0 +1,41 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_2() { + super(Versions.valueOf("7.2")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + executor.addScript("01", "fix_trip_longline_comment"); + } + +} + ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-H2.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment; +ALTER TABLE observe_longline.trip comment2 RENAME TO comment; ===================================== persistence/src/main/resources/db/migration/7.2/01_fix_trip_longline_comment-PG.sql ===================================== @@ -0,0 +1,25 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +ALTER TABLE observe_longline.trip ADD COLUMN comment2 VARCHAR(1025); +UPDATE observe_longline.trip set comment2 = comment; +ALTER TABLE observe_longline.trip DROP COLUMN comment CASCADE; +ALTER TABLE observe_longline.trip RENAME comment2 TO comment; ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.1</observe.model.version> + <observe.model.version>7.2</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0adde8dcc6128d2f9c0349738b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0adde8dcc6128d2f9c0349738b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 10 Sep '19

10 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0adde8dc by tchemit at 2019-09-10T13:01:04Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.28</version> + <version>2019.8.30</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0adde8dcc6128d2f9c0349738b0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0adde8dcc6128d2f9c0349738b0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce - Closes #1374
by Tony CHEMIT 10 Sep '19

10 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 04c2bdee by tchemit at 2019-09-10T11:54:35Z [SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce - Closes #1374 - - - - - 3 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java ===================================== @@ -60,6 +60,7 @@ public class ReferentialSynchronizeServiceLocal extends ObserveServiceLocal impl byte[] insertSqlCode = oppositeSqlsRequest.getInsertSqlCode(); byte[] insertAssociationSqlCode = oppositeSqlsRequest.getInsertAssociationSqlCode(); byte[] updateSqlCode = oppositeSqlsRequest.getUpdateSqlCode(); + byte[] updateAssociationSqlCode = oppositeSqlsRequest.getUpdateAssociationSqlCode(); byte[] deleteSqlCode = request.getDeleteSqlCode(); byte[] desactivateSqlCode = request.getDesactivateSqlCode(); @@ -67,6 +68,7 @@ public class ReferentialSynchronizeServiceLocal extends ObserveServiceLocal impl insertSqlCode, insertAssociationSqlCode, updateSqlCode, + updateAssociationSqlCode, desactivateSqlCode, deleteSqlCode); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== @@ -158,7 +158,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { String id = referentialDto.getId(); for (TopiaMetadataAssociation association : associations) { // On commence toujours par supprimer toutes les anciennes associations, elles seront ré-ajoutées juste après - String deleteSql = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + String deleteSql = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id); result.add(TopiaSqlStatements.boxAssociationStatement(deleteSql)); Collection<ReferentialDtoReference<?, ?>> associationValues = binder.obtainSourceProperty(referentialDto, association.getTargetPropertyName()); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java ===================================== @@ -40,6 +40,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private final byte[] insertAssociationSqlCode; private final byte[] insertSqlCode; private final byte[] updateSqlCode; + private final byte[] updateAssociationSqlCode; private final byte[] deleteAssociationSqlCode; private final byte[] deleteSqlCode; private final byte[] desactivateSqlCode; @@ -47,12 +48,14 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private ReferentialSynchronizeSqlsRequest(String insertSqlCode, String insertAssociationSqlCode, String updateSqlCode, + String updateAssociationSqlCode, String deleteSqlCode, String deleteAssociationSqlCode, String desactivateSqlCode) { this.insertSqlCode = insertSqlCode.getBytes(); this.insertAssociationSqlCode = insertAssociationSqlCode.getBytes(); this.updateSqlCode = updateSqlCode.getBytes(); + this.updateAssociationSqlCode= updateAssociationSqlCode.getBytes(); this.deleteSqlCode = deleteSqlCode.getBytes(); this.deleteAssociationSqlCode = deleteAssociationSqlCode.getBytes(); this.desactivateSqlCode = desactivateSqlCode.getBytes(); @@ -78,6 +81,10 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { return insertAssociationSqlCode; } + public byte[] getUpdateAssociationSqlCode() { + return updateAssociationSqlCode; + } + public byte[] getDeleteAssociationSqlCode() { return deleteAssociationSqlCode; } @@ -91,6 +98,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { private final StringBuilder addAssociationTasksBuilder = new StringBuilder(); private final StringBuilder addTasksBuilder = new StringBuilder(); private final StringBuilder updateTasksBuilder = new StringBuilder(); + private final StringBuilder updateAssociationTasksBuilder = new StringBuilder(); private final StringBuilder deleteTasksBuilder = new StringBuilder(); private final StringBuilder deleteAssociationTasksBuilder = new StringBuilder(); private final StringBuilder desactivateTasksBuilder = new StringBuilder(); @@ -99,6 +107,7 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { return new ReferentialSynchronizeSqlsRequest(addTasksBuilder.toString(), addAssociationTasksBuilder.toString(), updateTasksBuilder.toString(), + updateAssociationTasksBuilder.toString(), deleteTasksBuilder.toString(), deleteAssociationTasksBuilder.toString(), desactivateTasksBuilder.toString()); @@ -116,7 +125,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { public Builder addUpdateStatement(String sql) { log.info("Add update sql: " + sql); - updateTasksBuilder.append(sql); + if (sql.startsWith(TopiaSqlStatements.ASSOCIATION_STATEMENT_PREFIX)) { + updateAssociationTasksBuilder.append(TopiaSqlStatements.unboxAssociationStatement(sql)); + } else { + updateTasksBuilder.append(sql); + } return this; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04c2bdee816583b9f519bda4ceb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04c2bdee816583b9f519bda4ceb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update toolkit
by Tony CHEMIT 02 Sep '19

02 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cdae919d by tchemit at 2019-09-02T15:57:46Z update toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -160,7 +160,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.17-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.17</observeToolkitVersion> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdae919db8e41fdc2f99217439b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdae919db8e41fdc2f99217439b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 02 Sep '19

02 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc1f986c by tchemit at 2019-09-02T15:04:49Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -167,7 +167,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-56-SNAPSHOT</lib.version.java4all.jaxx> +     View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc1f986c7cf8e40c4640f4adc8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc1f986c7cf8e40c4640f4adc8f… You're receiving this email because of your account on gitlab.com.

1 0