Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 00b3d7b6 by Tony CHEMIT at 2018-09-17T13:57:56Z La synchro avancée du référentiel listes d'espèces provoque une exception - Closes #1054 - - - - - 2 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.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 ===================================== @@ -56,13 +56,19 @@ public class ReferentialSynchronizeServiceLocal extends ObserveServiceLocal impl public void executeSqlsRequests(ReferentialSynchronizeSqlsRequest request, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest) { long startTime = TimeLog.getTime(); - + byte[] deleteAssociationSqlCode = request.getDeleteAssociationSqlCode(); byte[] insertSqlCode = oppositeSqlsRequest.getInsertSqlCode(); + byte[] insertAssociationSqlCode = oppositeSqlsRequest.getInsertAssociationSqlCode(); byte[] updateSqlCode = oppositeSqlsRequest.getUpdateSqlCode(); byte[] deleteSqlCode = request.getDeleteSqlCode(); byte[] desactivateSqlCode = request.getDesactivateSqlCode(); - getTopiaPersistenceContext().executeSqlScripts(insertSqlCode, updateSqlCode, desactivateSqlCode, deleteSqlCode); + getTopiaPersistenceContext().executeSqlScripts(deleteAssociationSqlCode, + insertSqlCode, + insertAssociationSqlCode, + updateSqlCode, + desactivateSqlCode, + deleteSqlCode); timeLog.log(startTime, "executeSqlsRequests"); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng; */ import fr.ird.observe.dto.ObserveDto; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Created on 08/08/16. @@ -37,18 +37,24 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { /** Logger. */ private static final Logger log = LogManager.getLogger(ReferentialSynchronizeSqlsRequest.class); + private final byte[] insertAssociationSqlCode; private final byte[] insertSqlCode; private final byte[] updateSqlCode; + private final byte[] deleteAssociationSqlCode; private final byte[] deleteSqlCode; private final byte[] desactivateSqlCode; private ReferentialSynchronizeSqlsRequest(String insertSqlCode, + String insertAssociationSqlCode, String updateSqlCode, String deleteSqlCode, + String deleteAssociationSqlCode, String desactivateSqlCode) { this.insertSqlCode = insertSqlCode.getBytes(); + this.insertAssociationSqlCode = insertAssociationSqlCode.getBytes(); this.updateSqlCode = updateSqlCode.getBytes(); this.deleteSqlCode = deleteSqlCode.getBytes(); + this.deleteAssociationSqlCode = deleteAssociationSqlCode.getBytes(); this.desactivateSqlCode = desactivateSqlCode.getBytes(); } @@ -68,21 +74,33 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { return deleteSqlCode; } + public byte[] getInsertAssociationSqlCode() { + return insertAssociationSqlCode; + } + + public byte[] getDeleteAssociationSqlCode() { + return deleteAssociationSqlCode; + } + public byte[] getDesactivateSqlCode() { return desactivateSqlCode; } public static class Builder { + private final StringBuilder addAssociationTasksBuilder = new StringBuilder(); private final StringBuilder addTasksBuilder = new StringBuilder(); private final StringBuilder updateTasksBuilder = new StringBuilder(); private final StringBuilder deleteTasksBuilder = new StringBuilder(); + private final StringBuilder deleteAssociationTasksBuilder = new StringBuilder(); private final StringBuilder desactivateTasksBuilder = new StringBuilder(); public ReferentialSynchronizeSqlsRequest build() { return new ReferentialSynchronizeSqlsRequest(addTasksBuilder.toString(), + addAssociationTasksBuilder.toString(), updateTasksBuilder.toString(), deleteTasksBuilder.toString(), + deleteAssociationTasksBuilder.toString(), desactivateTasksBuilder.toString()); } @@ -90,7 +108,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { if (log.isInfoEnabled()) { log.info("Add add sql: " + sql); } - addTasksBuilder.append(sql); + if (sql.startsWith("$$_INSERT")) { + addAssociationTasksBuilder.append(sql.substring(3)); + } else { + addTasksBuilder.append(sql); + } return this; } @@ -107,7 +129,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto { if (log.isInfoEnabled()) { log.info("Add delete sql: " + sql); } - deleteTasksBuilder.append(sql); + if (sql.startsWith("$$_DELETE")) { + deleteAssociationTasksBuilder.append(sql.substring(3)); + } else { + deleteTasksBuilder.append(sql); + } return this; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/00b3d7b62d7f47778ab8b43bc16a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/00b3d7b62d7f47778ab8b43bc16a... You're receiving this email because of your account on gitlab.com.