This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c8eeb2553c5434152a6860d88c0e3461cf748bfd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 10:40:29 2016 +0200 [PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex (Fixes #8387) --- .../ObserveMigrationConfigurationProviderImpl.java | 1 + .../DataSourceMigrationForVersion_4_906.java | 59 +++++++++++++++++++++ .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 22 ++++++++ .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 22 ++++++++ pom.xml | 2 +- .../resources/db/4.906/dataForTestLongline.sql.gz | Bin 0 -> 1622154 bytes .../resources/db/4.906/dataForTestSeine.sql.gz | Bin 0 -> 451054 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441255 bytes test/src/main/resources/db/4.906/empty_h2.sql.gz | Bin 0 -> 6012 bytes test/src/main/resources/db/4.906/empty_pg.sql.gz | Bin 0 -> 6006 bytes .../src/main/resources/db/4.906/referentiel.sql.gz | Bin 0 -> 140211 bytes 11 files changed, 105 insertions(+), 1 deletion(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java index ae2e18d..5f27b38 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java @@ -66,6 +66,7 @@ public final class ObserveMigrationConfigurationProviderImpl extends ObserveMigr V_4_903("4.903"), V_4_904("4.904"), V_4_905("4.905"), + V_4_906("4.906"), // FIXME A utiliser en version final 5.0 V_5_0("5.0", false); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java new file mode 100644 index 0000000..007a138 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java @@ -0,0 +1,59 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Created on 02/09/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public abstract class DataSourceMigrationForVersion_4_906 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_906(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_906.getVersion(), callBack, scriptSuffix); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript("01", "add_non_target_length_sex_fk", queries); + } + } + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript("01", "add_non_target_length_sex_fk", queries); + } + } + + } + +} diff --git a/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql b/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql new file mode 100644 index 0000000..08027bf --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities Migration +-- %% +-- Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit +-- %% +-- 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_SEINE.NONTARGETLENGTH ADD CONSTRAINT FK_NONTARGETLENGTH_SEX FOREIGN KEY(SEX) REFERENCES OBSERVE_COMMON.SEX(topiaid); \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-PG.sql b/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-PG.sql new file mode 100644 index 0000000..025565c --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-PG.sql @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities Migration +-- %% +-- Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit +-- %% +-- 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_SEINE.NONTARGETLENGTH ADD CONSTRAINT FK_NONTARGETLENGTH_SEX FOREIGN KEY(SEX) REFERENCES OBSERVE_COMMON.SEX(topiaid); \ No newline at end of file diff --git a/pom.xml b/pom.xml index 14bf8ae..06b0a48 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.905</observe.model.version> + <observe.model.version>4.906</observe.model.version> </properties> diff --git a/test/src/main/resources/db/4.906/dataForTestLongline.sql.gz b/test/src/main/resources/db/4.906/dataForTestLongline.sql.gz new file mode 100644 index 0000000..319e802 Binary files /dev/null and b/test/src/main/resources/db/4.906/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/4.906/dataForTestSeine.sql.gz b/test/src/main/resources/db/4.906/dataForTestSeine.sql.gz new file mode 100644 index 0000000..f64f2db Binary files /dev/null and b/test/src/main/resources/db/4.906/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/4.906/dataForTestUnidirectionalReferentialSynchro.sql.gz b/test/src/main/resources/db/4.906/dataForTestUnidirectionalReferentialSynchro.sql.gz new file mode 100644 index 0000000..83914d1 Binary files /dev/null and b/test/src/main/resources/db/4.906/dataForTestUnidirectionalReferentialSynchro.sql.gz differ diff --git a/test/src/main/resources/db/4.906/empty_h2.sql.gz b/test/src/main/resources/db/4.906/empty_h2.sql.gz new file mode 100644 index 0000000..103da29 Binary files /dev/null and b/test/src/main/resources/db/4.906/empty_h2.sql.gz differ diff --git a/test/src/main/resources/db/4.906/empty_pg.sql.gz b/test/src/main/resources/db/4.906/empty_pg.sql.gz new file mode 100644 index 0000000..55d69a4 Binary files /dev/null and b/test/src/main/resources/db/4.906/empty_pg.sql.gz differ diff --git a/test/src/main/resources/db/4.906/referentiel.sql.gz b/test/src/main/resources/db/4.906/referentiel.sql.gz new file mode 100644 index 0000000..c094df7 Binary files /dev/null and b/test/src/main/resources/db/4.906/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.