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

Commits:

• b4a4ea00
  by Tony CHEMIT at 2018-05-04T08:35:12Z

  [jgitflow-maven-plugin]updating poms for 7.0-RC-13-SNAPSHOT development[skip ci]

• b53795d8
  by Tony CHEMIT at 2018-05-04T08:43:35Z

  [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]

• d9dbbb7f
  by Tony CHEMIT at 2018-05-04T08:43:35Z

  [jgitflow-maven-plugin]merging 'master' into 'develop'

• ca756982
  by Tony CHEMIT at 2018-05-04T08:43:36Z

  [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]

• 4c361596
  by Tony CHEMIT at 2018-05-04T09:17:42Z

  fix migration on pg + go back to RC-12
  

• 110240de
  by Tony CHEMIT at 2018-05-04T09:22:19Z

  [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with non-snapshot versions[skip ci]

• 053712ea
  by Tony CHEMIT at 2018-05-04T09:29:57Z

  [jgitflow-maven-plugin]merging 'release/7.0-RC-12' into 'master'

1 changed file:

• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java

Changes:

             });

             if (withoutWhaleSharkObservedSystem) {

                 queries.add("INSERT INTO observe_seine.activity_observedsystem(activity, observedSystem) VALUES('" + activityId + "', 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1');");

-                queries.add("UPDATE observe_seine.set s SET s.schoolType = 1 WHERE s.topiaId = (SELECT a.set FROM observe_seine.activity WHERE a.topiaId = '" + activityId + "');");

+                queries.add("UPDATE observe_seine.set SET schoolType = 1 WHERE topiaId = (SELECT a.set FROM observe_seine.activity a WHERE a.topiaId = '" + activityId + "');");

             }

         }

     }