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

[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 16 Sep '19

16 Sep '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 548c0023 by tchemit at 2019-09-16T09:52:08Z [LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs - Closes #1373 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.19</observeToolkitVersion> + <observeToolkitVersion>3.7.20</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/548c00233a7c70bc4bd6d57d739… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/548c00233a7c70bc4bd6d57d739… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix a selection node in model
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c053acc2 by tchemit at 2019-09-12T11:20:14Z fix a selection node in model - - - - - bf65b703 by tchemit at 2019-09-12T11:23:28Z Table actions are enabled even if there is no data in table... - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -128,6 +128,10 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e getModel().addPropertyChangeListener(ContentTableUIModel.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue())); + ui.getSelectFirstTableEntry().setEnabled(false); + ui.getSelectPreviousTableEntry().setEnabled(false); + ui.getSelectNextTableEntry().setEnabled(false); + ui.getSelectLastTableEntry().setEnabled(false); SelectFirst.init(ui, ui.getSelectFirstTableEntry(), SelectFirst.class); SelectPrevious.init(ui, ui.getSelectPreviousTableEntry(), SelectPrevious.class); SelectNext.init(ui, ui.getSelectNextTableEntry(), SelectNext.class); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineUIModel.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.client.ui.content.data.ll.observation; * #L% */ +import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.navigation.model.select.ObserveSelectNode; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -47,6 +49,11 @@ public class BranchlineUIModel extends ContentSimpleUIModel<BranchlineDto> { setAddMessageOnOpen(false); } + @Override + protected ObserveSelectNode<?> computeSelectNode() { + return ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityObsSet(); + } + public BranchlineDto getBranchline() { return branchlineDto; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6d5a1f942734ae9f9680ec6d6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6d5a1f942734ae9f9680ec6d6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT 12 Sep '19

12 Sep '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6d5a1f9 by tchemit at 2019-09-12T10:51:27Z update changelog [skip ci] - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/958566-artifacts.json - .mvn/gitlab-cache/milestones/958566-issues.json - .mvn/gitlab-cache/milestones/958566.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/921497-issues.json ===================================== @@ -243,7 +243,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 3, 2019 8:26:36 PM", + "updatedAt": "Aug 5, 2019 11:09:56 PM", "createdAt": "Jul 29, 2019 3:10:40 PM", "closedAt": "Aug 3, 2019 8:26:36 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1370" @@ -430,7 +430,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Jul 31, 2019 2:42:43 PM", + "updatedAt": "Aug 9, 2019 9:05:15 PM", "createdAt": "Jul 18, 2019 3:17:25 PM", "closedAt": "Jul 26, 2019 3:06:43 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1358" @@ -492,7 +492,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 5, 2019 1:16:49 AM", + "updatedAt": "Aug 5, 2019 11:09:54 PM", "createdAt": "Jul 29, 2019 3:17:42 PM", "closedAt": "Aug 5, 2019 1:15:20 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1371" @@ -545,7 +545,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 1, + "userNotesCount": 2, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -554,7 +554,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 4, 2019 4:48:52 PM", + "updatedAt": "Aug 5, 2019 11:09:55 PM", "createdAt": "Jul 29, 2019 1:05:44 PM", "closedAt": "Aug 4, 2019 4:48:52 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1369" @@ -802,7 +802,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 4, 2019 4:21:49 PM", + "updatedAt": "Aug 5, 2019 11:09:55 PM", "createdAt": "Jul 26, 2019 3:50:33 PM", "closedAt": "Aug 4, 2019 4:21:49 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1368" @@ -985,7 +985,7 @@ "totalTimeSpent": 0 }, "state": "closed", - "updatedAt": "Aug 5, 2019 1:17:09 AM", + "updatedAt": "Aug 9, 2019 9:05:15 PM", "createdAt": "Jun 12, 2019 3:44:04 PM", "closedAt": "Aug 5, 2019 1:17:09 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1332" ===================================== .mvn/gitlab-cache/milestones/958566-artifacts.json ===================================== @@ -1 +1,12 @@ -[] \ No newline at end of file +[ + { + "name": "Application", + "filename": "observe-7.1.1.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.1.1/observe-7.1.1.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.1.1.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.1.1/observe-7.1.1.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566-issues.json ===================================== @@ -1 +1,125 @@ -[] \ No newline at end of file +[ + { + "id": 24314624, + "iid": 1374, + "projectId": 2722779, + "title": "[SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d\u0027une espèce", + "description": "Connecté à 2 bases centrales en mode serveur (même serveur Tomcat, même serveur PG), la seule différence entre ces 2 bases (clone l\u0027une de l\u0027autre) est la mise à jour d\u0027un paramètre sur une espèce (YTL).\n\nEn voulant mettre à jour cette espèce dans la base cible :\n\n```\n30-Aug-2019 10:03:09.879 SEVERE [ajp-nio-8009-exec-26] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [default] in context with path [/observeweb] threw exception\n org.debux.webmotion.server.WebMotionException: Error during invoke method for action fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.ReferentialSynchronizeServiceRestApi on method executeSqlsRequests\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:283)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\tat sun.reflect.GeneratedMethodAccessor205.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processFilter(ExecutorMethodInvokerHandler.java:310)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:222)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler.handle(ExecutorMethodInvokerHandler.java:120)\n\tat org.debux.webmotion.server.WebMotionMainHandler.chainHandlers(WebMotionMainHandler.java:270)\n\tat org.debux.webmotion.server.WebMotionMainHandler.handleExecutors(WebMotionMainHandler.java:260)\n\tat org.debux.webmotion.server.WebMotionMainHandler.handle(WebMotionMainHandler.java:196)\n\tat org.debux.webmotion.server.WebMotionServer.doAction(WebMotionServer.java:159)\n\tat org.debux.webmotion.server.WebMotionServer.doFilter(WebMotionServer.java:136)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:200)\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\n\tat org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:678)\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\n\tat org.apache.coyote.ajp.AjpProcessor.service(AjpProcessor.java:394)\n\tat org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\n\tat org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:836)\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1747)\n\tat org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\n\tat java.lang.Thread.run(Thread.java:748)\nCaused by: java.lang.reflect.InvocationTargetException\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\t... 34 more\nCaused by: org.nuiton.topia.persistence.TopiaException: Could not execute sql code\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:168)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScript(ObserveTopiaPersistenceContext.java:179)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScripts(ObserveTopiaPersistenceContext.java:192)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal.executeSqlsRequests(ReferentialSynchronizeServiceLocal.java:66)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy200.executeSqlsRequests(Unknown Source)\n\tat fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.GeneratedReferentialSynchronizeServiceRestApi.executeSqlsRequests(GeneratedReferentialSynchronizeServiceRestApi.java:45)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\t... 27 more\nCaused by: org.hibernate.exception.SQLGrammarException: error executing work\n\tat org.hibernate.exception.internal.SQLStateConversionDelegate.convert(SQLStateConversionDelegate.java:103)\n\tat org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:325)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2462)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2447)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:166)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScript(ObserveTopiaPersistenceContext.java:179)\n\tat fr.ird.observe.persistence.ObserveTopiaPersistenceContext.executeSqlScripts(ObserveTopiaPersistenceContext.java:192)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal.executeSqlsRequests(ReferentialSynchronizeServiceLocal.java:66)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy200.executeSqlsRequests(Unknown Source)\n\tat fr.ird.observe.server.controller.v1.actions.synchro.referential.ng.GeneratedReferentialSynchronizeServiceRestApi.executeSqlsRequests(GeneratedReferentialSynchronizeServiceRestApi.java:45)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.processAction(ExecutorMethodInvokerHandler.java:255)\n\tat org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler$RunnableHandler.handle(ExecutorMethodInvokerHandler.java:225)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:73)\n\tat org.debux.webmotion.server.WebMotionFilter.doProcess(WebMotionFilter.java:61)\n\tat fr.ird.observe.server.ObserveWebMotionFilter.inject(ObserveWebMotionFilter.java:68)\n\tat sun.reflect.GeneratedMethodAccessor205.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\t... 27 more\nCaused by: org.postgresql.util.PSQLException: Unterminated dollar quote started at position 0 in SQL $$_DELETE FROM OBSERVE_COMMON.ocean_species WHERE ocean \u003d \u0027fr.ird.observe.entities.referentiel.Species#1239832684892#0.9272035028442585\u0027;. Expected terminating $$\n\tat org.postgresql.core.Parser.checkParsePosition(Parser.java:1273)\n\tat org.postgresql.core.Parser.parseSql(Parser.java:1173)\n\tat org.postgresql.core.Parser.replaceProcessing(Parser.java:1125)\n\tat org.postgresql.core.CachedQueryCreateAction.create(CachedQueryCreateAction.java:40)\n\tat org.postgresql.core.QueryExecutorBase.createQueryByKey(QueryExecutorBase.java:314)\n\tat org.postgresql.core.QueryExecutorBase.createQuery(QueryExecutorBase.java:325)\n\tat org.postgresql.jdbc.PgConnection.createQuery(PgConnection.java:161)\n\tat org.postgresql.jdbc.PgStatement.addBatch(PgStatement.java:723)\n\tat com.zaxxer.hikari.pool.HikariProxyStatement.addBatch(HikariProxyStatement.java)\n\tat org.nuiton.topia.persistence.script.SqlScriptConsumer.executeByBatch(SqlScriptConsumer.java:198)\n\tat org.nuiton.topia.persistence.script.SqlScriptConsumer.execute(SqlScriptConsumer.java:138)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport$HibernateTopiaSqlWork.execute(HibernateTopiaSqlSupport.java:91)\n\tat org.hibernate.jdbc.WorkExecutor.executeWork(WorkExecutor.java:37)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2443)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2440)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:320)\n\t... 54 more\n\n\n```", + "labels": [ + "Anomalie", + "Immédiat", + "À corriger" + ], + "milestone": { + "id": 958566, + "iid": 148, + "projectId": 2722779, + "groupId": 0, + "title": "7.1.1", + "dueDate": "Sep 12, 2019 2:00:00 AM", + "startDate": "Aug 2, 2019 2:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Sep 12, 2019 12:47:48 PM", + "createdAt": "Aug 30, 2019 10:08:24 AM", + "closedAt": "Sep 12, 2019 12:47:43 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1374" + }, + { + "id": 24172420, + "iid": 1373, + "projectId": 2722779, + "title": "[LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs", + "description": "En mode serveur, cette marée ne peut pas être insérée en base centrale car elle semble provoquer un dépassement mémoire.\n\nMarée : [obstuna-local-2019-06-11--15-28-31-vf.sql.gz](/uploads/3b3498860d332631f3899d508e1786df/obstuna-local-2019-06-11--15-28-31-vf.sql.gz)\n\nLog serveur : [catalina.out](/uploads/8bc861905549457149f82689be503b3b/catalina.out)", + "labels": [ + "Anomalie", + "Haut", + "Palangre" + ], + "milestone": { + "id": 958566, + "iid": 148, + "projectId": 2722779, + "groupId": 0, + "title": "7.1.1", + "dueDate": "Sep 12, 2019 2:00:00 AM", + "startDate": "Aug 2, 2019 2:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": true, + "discussionLocked": true, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Sep 12, 2019 12:48:43 PM", + "createdAt": "Aug 26, 2019 6:00:15 PM", + "closedAt": "Sep 12, 2019 12:19:00 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1373" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/958566.json ===================================== @@ -4,7 +4,7 @@ "projectId": 2722779, "groupId": 0, "title": "7.1.1", - "dueDate": "Aug 3, 2019 2:00:00 AM", + "dueDate": "Sep 12, 2019 2:00:00 AM", "startDate": "Aug 2, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-08-05 01:18. + * Last generated at 2019-09-12 12:50. ## Version [8.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/146) @@ -222,6 +222,18 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.1.1](https://gitlab.com/ultreiaio/ird-observe/milestones/148) + +**Closed at 2019-09-12.** + +### Download +* [Application (observe-7.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.1.1.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1373]](https://gitlab.com/ultreiaio/ird-observe/issues/1373) **[LL] Une marée provoque un dépassement mémoire et/ou a un souci de commentaires trop longs** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1374]](https://gitlab.com/ultreiaio/ird-observe/issues/1374) **[SYNCHRO AVANCEE] Une requête SQL échoue sur mise à jour d'une espèce** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.1.0](https://gitlab.com/ultreiaio/ird-observe/milestones/147) **Closed at 2019-08-03.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6d5a1f942734ae9f9680ec6d60… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6d5a1f942734ae9f9680ec6d60… You're receiving this email because of your account on gitlab.com.

1 0

[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