This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bf27bf05812c6ba5a37c3b0172a490c14d33dfe5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:35:58 2015 +0200 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne --- .../migration/versions/DataSourceMigrationForVersion_4_0_RC3.java | 5 ++++- .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 1 + .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index e34b5b6..b8e7dec 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -42,8 +42,12 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse boolean showProgression) throws TopiaException { + // See https://forge.codelutin.com/issues/6964 addMissingForeignKeys(tx, queries); + // See https://forge.codelutin.com/issues/6983 + loadScript("update-senne-gear-usedInTrip"); + } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { @@ -206,7 +210,6 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse "AND indisprimary = FALSE;"; PreparedStatement ps = connection.prepareStatement(sql); ps.setInt(1, oid); -// ps.setString(2, String.valueOf(attNum)); try { ResultSet set = ps.executeQuery(); diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.