GitLab

at 2019-05-06T12:03:13Z

[jgitflow-maven-plugin]updating poms for 7.0.7-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
update pom

[SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK - Closes #1270

[jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/7.0.7' into 'master-7.x'
   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>client-core</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>client-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>observe-i18n</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>persistence</artifactId>

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2019.8.15</version>

+    <version>2019.8.16</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

   <artifactId>ird-observe</artifactId>

-  <version>7.0.6</version>

+  <version>7.0.7</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

     <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>

     <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>

     <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->

-    <lib.version.java4all.topia>1.1.12</lib.version.java4all.topia>

+    <lib.version.java4all.topia>1.1.13</lib.version.java4all.topia>

 

     <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->

     <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>server-core</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>server-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>services-local</artifactId>

  */

 

 import com.google.common.collect.ImmutableList;

+import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;

+import fr.ird.observe.persistence.ObserveEntityEnum;

+import org.nuiton.topia.persistence.TopiaEntity;

 import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation;

 import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity;

 import org.nuiton.topia.persistence.metadata.TopiaMetadataModel;

 public class DeleteSqlStatementGenerator {

 

     private final Set<TopiaMetadataAssociation> associations;

+    private final Set<TopiaMetadataAssociation> reverseAssociations;

     private final TopiaMetadataEntity metadataEntity;

 

     public DeleteSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) {

         this.metadataEntity = Objects.requireNonNull(metadataEntity);

-        this.associations = topiaMetadataModel.getReverseAssociations(metadataEntity);

+        this.associations = topiaMetadataModel.getAssociations(metadataEntity);

+        this.reverseAssociations = topiaMetadataModel.getReverseAssociations(metadataEntity);

     }

 

     public List<String> generateSql(String id) {

         String sql = TopiaSqlStatements.generateDeleteStatement(metadataEntity, id);

         result.add(sql);

         for (TopiaMetadataAssociation association : associations) {

-            String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id);

+            String sql2 = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id);

             result.add(TopiaSqlStatements.boxAssociationStatement(sql2));

         }

+        for (TopiaMetadataAssociation association : reverseAssociations) {

+            Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf(association.getOwner().getType()).getContract();

+            if (ObserveReferentialEntity.class.isAssignableFrom(entityType)) {

+                // always delete referential associations

+                // this is the opposite of https://gitlab.com/ultreiaio/ird-observe/issues/1065

+                // See https://gitlab.com/ultreiaio/ird-observe/issues/11270

+                String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id);

+                result.add(TopiaSqlStatements.boxAssociationStatement(sql2));

+            }

+        }

         return result.build();

     }

 

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.0.6</version>

+    <version>7.0.7</version>

   </parent>

 

   <artifactId>validation</artifactId>

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe

Commits:

17 changed files:

Changes: