branch develop-4.x updated (99cbe33 -> 7625df3)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git from 99cbe33 Modification du log sur la modification des coordonnées (See #7431) new ef40be9 Ajout d'une migration 4.0.2 en déplaçant le code posant problème pour PG en 4.0.2 (See #7467) new c0e748a Ajout base de test pour la 4.0.2 (See #7467) new 7625df3 La migration 4.0->4.0.1.1 plante sur PostgreSQL 8 (termine #7467) Merge branch 'feature/7467' into develop-4.x The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7625df38b42935273a86ceae477902f8d2955791 Merge: 99cbe33 c0e748a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:21 2015 +0200 La migration 4.0->4.0.1.1 plante sur PostgreSQL 8 (termine #7467) Merge branch 'feature/7467' into develop-4.x commit c0e748a699bcabd0457e36f5f3ecb566296890d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:19 2015 +0200 Ajout base de test pour la 4.0.2 (See #7467) commit ef40be973088484a13d498405969e9538ad0a521 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:02 2015 +0200 Ajout d'une migration 4.0.2 en déplaçant le code posant problème pour PG en 4.0.2 (See #7467) Summary of changes: .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes .../migration/AbstractDataSourceMigration.java | 4 ++- .../DataSourceMigrationForVersion_4_0_1.java | 13 ++++++-- ...va => DataSourceMigrationForVersion_4_0_2.java} | 37 +++++++++++---------- .../resources/db/4.0.1/remove-gender-column-PG.sql | 22 ------------ .../remove-gender-column-PG.sql} | 2 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 9 files changed, 36 insertions(+), 48 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_0.java => DataSourceMigrationForVersion_4_0_2.java} (65%) delete mode 100644 observe-entities/src/main/resources/db/4.0.1/remove-gender-column-PG.sql copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0.2/remove-gender-column-PG.sql} (91%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit ef40be973088484a13d498405969e9538ad0a521 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:02 2015 +0200 Ajout d'une migration 4.0.2 en déplaçant le code posant problème pour PG en 4.0.2 (See #7467) --- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_1.java | 13 +++- .../DataSourceMigrationForVersion_4_0_2.java | 75 ++++++++++++++++++++++ .../{4.0.1 => 4.0.2}/remove-gender-column-PG.sql | 2 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 7 files changed, 92 insertions(+), 8 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 4133d06..2ea4149 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 @@ -89,10 +89,12 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_1 = Versions.valueOf("4.0.1"); + public static final Version V_4_0_2 = Versions.valueOf("4.0.2"); + /** Les versions de mise à jour disponibles. */ 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_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index f15ec4b..e0c092c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -64,9 +64,6 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv boolean showSql, boolean showProgression) throws TopiaException { - // See https://forge.codelutin.com/issues/7226 - addScript("remove-gender-column", queries); - // See https://forge.codelutin.com/issues/7229 removeForeignKeys(tx, queries); addScript("add-missing-fk", queries); @@ -181,6 +178,16 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + + // See https://forge.codelutin.com/issues/7226 + addScript("remove-gender-column", queries); + + super.prepareMigrationScript(tx, queries, showSql, showProgression); + + } + + @Override protected void removeForeignKeys(TopiaContextImplementor tx, List<String> queries) { H2DataSourceMigration.removeFKIfExists(tx, "observe_seine", "FLOATINGOBJECT", "OBJECTTYPE", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java new file mode 100644 index 0000000..3cee5c7 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java @@ -0,0 +1,75 @@ +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.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.util.List; + +/** + * Created on 6/8/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0.1 + */ +public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_0_2, callBack, scriptSuffix); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_2 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + // Rien à faire (déjà fait en 4.0.1) + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_2 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + + // See http://forge.codelutin.com/issues/7467 + addScript("remove-gender-column", queries); + + } + + } + +} diff --git a/observe-entities/src/main/resources/db/4.0.1/remove-gender-column-PG.sql b/observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql similarity index 90% rename from observe-entities/src/main/resources/db/4.0.1/remove-gender-column-PG.sql rename to observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql index aea6b29..e6c4337 100644 --- a/observe-entities/src/main/resources/db/4.0.1/remove-gender-column-PG.sql +++ b/observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql @@ -19,4 +19,4 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE observe_common.lengthweightparameter DROP COLUMN IF EXISTS gender; \ No newline at end of file +ALTER TABLE observe_common.lengthweightparameter DROP COLUMN gender; \ No newline at end of file diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 62323b7..78dfab2 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=4.0.2 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 1340a65..7a5450e 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=4.0.2 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index e04f24e..21d5297 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=4.0.2 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit c0e748a699bcabd0457e36f5f3ecb566296890d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:19 2015 +0200 Ajout base de test pour la 4.0.2 (See #7467) --- .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz b/observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz new file mode 100644 index 0000000..1447432 Binary files /dev/null and b/observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 7625df38b42935273a86ceae477902f8d2955791 Merge: 99cbe33 c0e748a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 15:51:21 2015 +0200 La migration 4.0->4.0.1.1 plante sur PostgreSQL 8 (termine #7467) Merge branch 'feature/7467' into develop-4.x .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_1.java | 13 +++- .../DataSourceMigrationForVersion_4_0_2.java | 75 +++++++++++++++++++++ .../{4.0.1 => 4.0.2}/remove-gender-column-PG.sql | 2 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 8 files changed, 92 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm