This is an automated email from the git hooks/post-receive script. New commit to branch feature/7589_impossible_de_creer_un_equipement_en_serveur_distant in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit b0f119124e9a7392415a7a580514ec6dffb382c6 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Jul 20 16:00:51 2016 +0200 Fix GearUseFeatures save error with distant database and distant server Remove not null constraint on column gearUseFeatures in table gearUseFeaturesMeasurement refs #7589 --- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_904.java | 69 ++++++++++++++++++++++ ...drop_not_null_constraint_gearUseFeatures-H2.sql | 1 + ...drop_not_null_constraint_gearUseFeatures-PG.sql | 1 + pom.xml | 2 +- 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index c78e41c..1599934 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -73,6 +73,7 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_901 = Versions.valueOf("4.901"); public static final Version V_4_902 = Versions.valueOf("4.902"); public static final Version V_4_903 = Versions.valueOf("4.903"); + public static final Version V_4_904 = Versions.valueOf("4.904"); // FIXME A utiliser en version final 5.0 public static final Version V_5_0 = Versions.valueOf("5.0"); @@ -83,7 +84,7 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version[] availableVersions = new Version[]{ V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, V_4_0_4, - V_4_900, V_4_901, V_4_902, V_4_903 + V_4_900, V_4_901, V_4_902, V_4_903, V_4_904 // FIXME A utiliser en version final 5.0 //V_5_0 diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java new file mode 100644 index 0000000..5861592 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java @@ -0,0 +1,69 @@ +package fr.ird.observe.entities.migration.versions; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 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% + */ + +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.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 20/07/16. + * + * @author Samuel Maisonneuve - maisonneuve@codelutin.com + */ +public class DataSourceMigrationForVersion_4_904 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_904(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_904, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + addScript("01", "drop_not_null_constraint_gearUseFeatures", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql b/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql new file mode 100644 index 0000000..f82e8f0 --- /dev/null +++ b/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql @@ -0,0 +1 @@ +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ALTER COLUMN GEARUSEFEATURES DROP NOT NULL; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql b/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql new file mode 100644 index 0000000..f82e8f0 --- /dev/null +++ b/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql @@ -0,0 +1 @@ +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ALTER COLUMN GEARUSEFEATURES DROP NOT NULL; \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3ec5084..87568c1 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.903</observe.model.version> + <observe.model.version>4.904</observe.model.version> </properties> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.