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 c44d26f754fc65bd8774466ea7fbf5572ff1ae75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 21:04:09 2016 +0200 Migraion 4.905 pour supprimer les contraintes de nullité sur l'identifiant filage (See #7543) --- .../ObserveMigrationConfigurationProviderImpl.java | 1 + .../DataSourceMigrationForVersion_4_905.java | 49 +++++++++++++++++++++ ...p_not_null_constraint_hauling_identifier-H2.sql | 24 ++++++++++ ...p_not_null_constraint_hauling_identifier-PG.sql | 24 ++++++++++ entities/src/main/xmi/observe-longline.properties | 5 --- pom.xml | 2 +- .../ird/observe/test/ObserveTestConfiguration.java | 1 + .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 0 -> 1622096 bytes .../resources/db/4.905/dataForTestSeine.sql.gz | Bin 0 -> 451016 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441248 bytes test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 0 -> 6006 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 0 -> 6004 bytes .../src/main/resources/db/4.905/referentiel.sql.gz | Bin 0 -> 140214 bytes test/src/main/resources/observetest.properties | 1 + 14 files changed, 101 insertions(+), 6 deletions(-) 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 755c3e0..ae2e18d 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 @@ -65,6 +65,7 @@ public final class ObserveMigrationConfigurationProviderImpl extends ObserveMigr V_4_902("4.902"), V_4_903("4.903"), V_4_904("4.904"), + V_4_905("4.905"), // 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_905.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java new file mode 100644 index 0000000..cb048b7 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java @@ -0,0 +1,49 @@ +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; + +/** + * Created on 02/09/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSourceMigrationForVersion_4_905 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_905(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_905.getVersion(), callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + addScript("01", "drop_not_null_constraint_hauling_identifier", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql new file mode 100644 index 0000000..d5e9401 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql @@ -0,0 +1,24 @@ +--- +-- #%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_LONGLINE.SECTION ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BASKET ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ALTER COLUMN haulingIdentifier DROP NOT NULL; diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql new file mode 100644 index 0000000..d5e9401 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql @@ -0,0 +1,24 @@ +--- +-- #%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_LONGLINE.SECTION ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BASKET ALTER COLUMN haulingIdentifier DROP NOT NULL; +ALTER TABLE OBSERVE_LONGLINE.BRANCHLINE ALTER COLUMN haulingIdentifier DROP NOT NULL; diff --git a/entities/src/main/xmi/observe-longline.properties b/entities/src/main/xmi/observe-longline.properties index 069e1d0..3a7d693 100644 --- a/entities/src/main/xmi/observe-longline.properties +++ b/entities/src/main/xmi/observe-longline.properties @@ -155,12 +155,7 @@ fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeatur ############################################################################### fr.ird.observe.entities.longline.Section.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Section.attribute.haulingIdentifier.tagValue.notNull=true - fr.ird.observe.entities.longline.Basket.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Basket.attribute.haulingIdentifier.tagValue.notNull=true - fr.ird.observe.entities.longline.Branchline.attribute.settingIdentifier.tagValue.notNull=true -fr.ird.observe.entities.longline.Branchline.attribute.haulingIdentifier.tagValue.notNull=true fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline.attribute.gearCaracteristic.tagValue.notNull=true diff --git a/pom.xml b/pom.xml index a3020af..b70b217 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.904</observe.model.version> + <observe.model.version>4.905</observe.model.version> <jrstPluginVersion>2.1</jrstPluginVersion> diff --git a/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java b/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java index 7bea41b..37e9e70 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java @@ -49,6 +49,7 @@ public class ObserveTestConfiguration { public static final String MODEL_VERSION = "observetest.model.version"; public static final String PREVIOUS_VERSION = "observetest.previous.model.version"; public static final String FIRST_VERSION = "observetest.first.model.version"; + public static final String FIRST_VERSION_FOR_REF_SYNCHRO = "observetest.first.model.for.ref.synchro.version"; public static final String H2_LOGIN = "observetest.h2.login"; public static final String H2_PASSWORD = "observetest.h2.password"; public static final String WEB_LOGIN = "observetest.web.login"; diff --git a/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz b/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz new file mode 100644 index 0000000..f9aa86d Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz b/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz new file mode 100644 index 0000000..38bd854 Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz b/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz new file mode 100644 index 0000000..147c747 Binary files /dev/null and b/test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz differ diff --git a/test/src/main/resources/db/4.905/empty_h2.sql.gz b/test/src/main/resources/db/4.905/empty_h2.sql.gz new file mode 100644 index 0000000..d4bbe0a Binary files /dev/null and b/test/src/main/resources/db/4.905/empty_h2.sql.gz differ diff --git a/test/src/main/resources/db/4.905/empty_pg.sql.gz b/test/src/main/resources/db/4.905/empty_pg.sql.gz new file mode 100644 index 0000000..5ac96a5 Binary files /dev/null and b/test/src/main/resources/db/4.905/empty_pg.sql.gz differ diff --git a/test/src/main/resources/db/4.905/referentiel.sql.gz b/test/src/main/resources/db/4.905/referentiel.sql.gz new file mode 100644 index 0000000..3fa51e2 Binary files /dev/null and b/test/src/main/resources/db/4.905/referentiel.sql.gz differ diff --git a/test/src/main/resources/observetest.properties b/test/src/main/resources/observetest.properties index 9674539..0da7256 100644 --- a/test/src/main/resources/observetest.properties +++ b/test/src/main/resources/observetest.properties @@ -24,6 +24,7 @@ observetest.build.version=${project.version} observetest.model.version=${observe.model.version} observetest.previous.model.version=4.0.1 observetest.first.model.version=4.0.1 +observetest.first.model.for.ref.synchro.version=4.903 observetest.h2.login=sa observetest.h2.password=sa observetest.web.url=http://localhost:8080/observeweb/api/v1 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.