Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • client/datasource/editor/spi/pom.xml
    ... ... @@ -154,6 +154,18 @@
    154 154 
           <scope>test</scope>
    155 155 
         </dependency>
    156 156 
       </dependencies>
    157 
    +  <build>
    158 
    +    <pluginManagement>
    159 
    +      <plugins>
    160 
    +        <plugin>
    161 
    +          <artifactId>maven-plugin-plugin</artifactId>
    162 
    +          <configuration>
    163 
    +            <goalPrefix>client-datasource-editor-spi</goalPrefix>
    164 
    +          </configuration>
    165 
    +        </plugin>
    166 
    +      </plugins>
    167 
    +    </pluginManagement>
    168 
    +  </build>
    157 169 
       <profiles>
    158 170 
         <profile>
    159 171 
           <id>reporting</id>

  • core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json
    ... ... @@ -120,23 +120,23 @@
    120 120 
           "ll_observation.set→DELETE FROM ll_observation.set WHERE set.activity %s;",
    121 121 
           "ll_observation.sensorUsed→DELETE FROM ll_observation.sensorUsed WHERE sensorUsed.activity %s;",
    122 122 
           "ll_observation.encounter→DELETE FROM ll_observation.encounter WHERE encounter.activity %s;",
    123 
    -      "ll_logbook.activity→UPDATE ll_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s",
    123 
    +      "ll_logbook.activity→UPDATE ll_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s",
    124 124 
           "ll_observation.activity→DELETE FROM ll_observation.activity WHERE activity.topiaId %s;"
    125 125 
         ],
    126 126 
         "fr.ird.observe.entities.data.ll.observation.BaitsComposition": [
    127 127 
           "ll_observation.baitsComposition→DELETE FROM ll_observation.baitsComposition WHERE baitsComposition.topiaId %s;"
    128 128 
         ],
    129 129 
         "fr.ird.observe.entities.data.ll.observation.Basket": [
    130 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline  WHERE branchline.basket %s )",
    131 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline  WHERE branchline.basket %s )",
    130 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline  WHERE branchline.basket %s )",
    131 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline  WHERE branchline.basket %s )",
    132 132 
           "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.basket %s;",
    133 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.basket = NULL WHERE catch.basket %s",
    134 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.basket = NULL WHERE tdr.basket %s",
    133 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET basket = NULL WHERE catch.basket %s",
    134 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET basket = NULL WHERE tdr.basket %s",
    135 135 
           "ll_observation.basket→DELETE FROM ll_observation.basket WHERE basket.topiaId %s;"
    136 136 
         ],
    137 137 
         "fr.ird.observe.entities.data.ll.observation.Branchline": [
    138 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline %s",
    139 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline %s",
    138 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline %s",
    139 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline %s",
    140 140 
           "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.topiaId %s;"
    141 141 
         ],
    142 142 
         "fr.ird.observe.entities.data.ll.observation.BranchlinesComposition": [
    ... ... @@ -158,14 +158,14 @@
    158 158 
           "ll_observation.hooksComposition→DELETE FROM ll_observation.hooksComposition WHERE hooksComposition.topiaId %s;"
    159 159 
         ],
    160 160 
         "fr.ird.observe.entities.data.ll.observation.Section": [
    161 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline IN ( SELECT catch.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.catch catch_ ON catch_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )",
    162 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline IN ( SELECT tdr.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.tdr tdr_ ON tdr_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )",
    161 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline IN ( SELECT catch.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.catch catch_ ON catch_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )",
    162 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline IN ( SELECT tdr.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.tdr tdr_ ON tdr_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )",
    163 163 
           "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.topiaId IN (SELECT branchline.topiaId FROM ll_observation.branchline branchline INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s);",
    164 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.basket = NULL WHERE catch.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket  WHERE basket.section %s )",
    165 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.basket = NULL WHERE tdr.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket  WHERE basket.section %s )",
    164 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET basket = NULL WHERE catch.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket  WHERE basket.section %s )",
    165 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET basket = NULL WHERE tdr.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket  WHERE basket.section %s )",
    166 166 
           "ll_observation.basket→DELETE FROM ll_observation.basket WHERE basket.section %s;",
    167 
    -      "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.section = NULL WHERE catch.section %s",
    168 
    -      "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.section = NULL WHERE tdr.section %s",
    167 
    +      "ll_observation.catch→UPDATE ll_observation.catch SET section = NULL WHERE catch.section %s",
    168 
    +      "ll_observation.tdr→UPDATE ll_observation.tdr SET section = NULL WHERE tdr.section %s",
    169 169 
           "ll_observation.section→DELETE FROM ll_observation.section WHERE section.topiaId %s;"
    170 170 
         ],
    171 171 
         "fr.ird.observe.entities.data.ll.observation.SensorUsed": [
    ... ... @@ -268,7 +268,7 @@
    268 268 
         ],
    269 269 
         "fr.ird.observe.entities.data.ps.localmarket.Survey": [
    270 270 
           "ps_localmarket.surveyPart→DELETE FROM ps_localmarket.surveyPart WHERE surveyPart.survey %s;",
    271 
    -      "ps_localmarket.batch→UPDATE ps_localmarket.batch batch SET batch.survey = NULL WHERE batch.survey %s",
    271 
    +      "ps_localmarket.batch→UPDATE ps_localmarket.batch SET survey = NULL WHERE batch.survey %s",
    272 272 
           "ps_localmarket.survey→DELETE FROM ps_localmarket.survey WHERE survey.topiaId %s;"
    273 273 
         ],
    274 274 
         "fr.ird.observe.entities.data.ps.localmarket.SurveyPart": [
    ... ... @@ -353,7 +353,7 @@
    353 353 
           "ps_observation.floatingObject→DELETE FROM ps_observation.floatingObject WHERE floatingObject.activity %s;",
    354 354 
           "ps_observation.catch→DELETE FROM ps_observation.catch WHERE catch.topiaId IN (SELECT catch.topiaId FROM ps_observation.catch catch INNER JOIN ps_observation.set set ON set.topiaId = catch.set WHERE set.activity %s);",
    355 355 
           "ps_observation.set→DELETE FROM ps_observation.set WHERE set.activity %s;",
    356 
    -      "ps_logbook.activity→UPDATE ps_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s",
    356 
    +      "ps_logbook.activity→UPDATE ps_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s",
    357 357 
           "ps_observation.activity→DELETE FROM ps_observation.activity WHERE activity.topiaId %s;"
    358 358 
         ],
    359 359 
         "fr.ird.observe.entities.data.ps.observation.Catch": [
    ... ... @@ -391,7 +391,7 @@
    391 391 
           "ps_observation.floatingObject→DELETE FROM ps_observation.floatingObject WHERE floatingObject.topiaId IN (SELECT floatingObject.topiaId FROM ps_observation.floatingObject floatingObject INNER JOIN ps_observation.activity activity ON activity.topiaId = floatingObject.activity WHERE activity.route %s);",
    392 392 
           "ps_observation.catch→DELETE FROM ps_observation.catch WHERE catch.topiaId IN (SELECT catch.topiaId FROM ps_observation.catch catch INNER JOIN ps_observation.set set ON set.topiaId = catch.set  INNER JOIN ps_observation.activity activity ON activity.topiaId = set.activity WHERE activity.route %s);",
    393 393 
           "ps_observation.set→DELETE FROM ps_observation.set WHERE set.topiaId IN (SELECT set.topiaId FROM ps_observation.set set INNER JOIN ps_observation.activity activity ON activity.topiaId = set.activity WHERE activity.route %s);",
    394 
    -      "ps_logbook.activity→UPDATE ps_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity IN ( SELECT activity.topiaId FROM ps_observation.activity activity  WHERE activity.route %s )",
    394 
    +      "ps_logbook.activity→UPDATE ps_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity IN ( SELECT activity.topiaId FROM ps_observation.activity activity  WHERE activity.route %s )",
    395 395 
           "ps_observation.activity→DELETE FROM ps_observation.activity WHERE activity.route %s;",
    396 396 
           "ps_observation.route→DELETE FROM ps_observation.route WHERE route.topiaId %s;"
    397 397 
         ],

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -  <version>2023.47</version>
    26 
    +    <version>2024.01</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>
    ... ... @@ -129,6 +129,7 @@
    129 129 
         <!-- FIXME   <lib.version.jts>1.18.2</lib.version.jts>-->
    130 130 
         <lib.version.hsqldb>2.7.0</lib.version.hsqldb>
    131 131 
         <!-- FIXME   <lib.version.hsqldb>2.7.1</lib.version.hsqldb>-->
    132 
    +    <lib.version.java4all.http>1.0.47</lib.version.java4all.http>
    132 133 
         <!-- license header configuration -->
    133 134 
         <license.licenseName>gpl_v3</license.licenseName>
    134 135 
         <license.organizationName>IRD, Ultreia.io</license.organizationName>

  • toolkit/api-services/src/main/java/fr/ird/observe/services/service/data/MoveRequest.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.data;
    25 25 
     import fr.ird.observe.dto.BusinessDto;
    26 26 
     import fr.ird.observe.dto.ToolkitIdDtoBean;
    27 27 
     import fr.ird.observe.dto.data.RootOpenableDto;
    28 
    +import io.ultreia.java4all.util.json.JsonAware;
    28 29
    29 30 
     import java.util.Set;
    30 31 
     import java.util.StringJoiner;
    ... ... @@ -35,7 +36,7 @@ import java.util.StringJoiner;
    35 36 
      * @author Tony Chemit - dev@tchemit.fr
    36 37 
      * @since 8.0.1
    37 38 
      */
    38 
    -public class MoveRequest {
    39 
    +public class MoveRequest implements JsonAware {
    39 40
    40 41 
         /**
    41 42 
          * Id of parent data to move.

  • toolkit/templates/src/main/java/org/nuiton/topia/templates/sql/plan/SqlHelper.java
    ... ... @@ -41,7 +41,7 @@ public class SqlHelper {
    41 41 
         public static final String FROM_SQL = "%s WHERE %s";
    42 42 
         public static final String FROM_SQL_NO_WHERE = "%s";
    43 43 
         public static final String SQL_WHERE_CLAUSE_ALIAS = "%1$s.%2$s";
    44 
    -    public static final String DELETE_REVERSE_ASSOCIATION_STATEMENT = "UPDATE %1$s.%2$s %2$s SET %2$s.%3$s = NULL WHERE %4$s";
    44 
    +    public static final String DELETE_REVERSE_ASSOCIATION_STATEMENT = "UPDATE %1$s.%2$s SET %3$s = NULL WHERE %4$s";
    45 45 
         public static final String DELETE_FROM_SELECTOR_STATEMENT = "DELETE FROM %1$s.%2$s WHERE %2$s.%3$s IN (%4$s);";
    46 46 
         public static final String DELETE_FROM_SELECTOR_SIMPLIFIED_STATEMENT = "DELETE FROM %1$s.%2$s WHERE %3$s;";
    47 47

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help