branch develop updated (d09ff41 -> ca2178d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from d09ff41 correction du nom repetoire des bases de test. new 23dd30d Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (termine #7431) new e288eba Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) new 1d53165 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (termine #7486) new 7cf06e3 Ajout base de test pour la 4.0.2 (See #7467) new 1a2fc2a 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 c17da19 Utilisation du type Long new fffcdee Ne pas ajouter aux requetes de migrations les commentaires new ca2178d Correction de l'api de migration suite au cherry-pcik The 8 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 ca2178defddb1e397383ec702d5be3921011722c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:48:33 2015 +0200 Correction de l'api de migration suite au cherry-pcik commit fffcdeeb3d862f0bbeb33c5a5fdd128a10da6b90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:48:17 2015 +0200 Ne pas ajouter aux requetes de migrations les commentaires commit c17da19687c2ad7919aea320008e1c79afa0e94f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:47:58 2015 +0200 Utilisation du type Long commit 1a2fc2aad94701df72dc4e9b49d83fd6641f1fe8 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) commit 7cf06e3fe662feec29f33f15766438cd08c7ae1e 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 1d531657c3cc9e7c63e3539f2430fa808a6bce0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:05:46 2015 +0200 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (termine #7486) commit e288eba6fe1fa5795bced50b9420e049d810b3fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:58:44 2015 +0200 Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) commit 23dd30d63d1b3bec37ef9968050c1259f6fbba8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:59:27 2015 +0200 Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (termine #7431) Summary of changes: .../impl/longline/SetLonglineUIHandler.java | 5 +++ .../impl/longline/ActivityLonglineUIHandler.java | 2 ++ .../open/impl/seine/ActivitySeineUIHandler.java | 2 ++ .../open/impl/seine/ActivitySeineUIModel.java | 2 +- .../java/fr/ird/observe/db/util/PGInstall.java | 2 +- .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes .../migration/AbstractDataSourceMigration.java | 4 ++- .../AbstractObserveMigrationCallBack.java | 34 +++++++++++-------- .../DataSourceMigrationForVersion_4_0_1.java | 14 ++++++-- ...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 +- pom.xml | 2 +- 14 files changed, 68 insertions(+), 62 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} (66%) 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 in repository observe. See http://git.codelutin.com/observe.git commit 23dd30d63d1b3bec37ef9968050c1259f6fbba8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:59:27 2015 +0200 Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (termine #7431) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a6f72f0..32c0ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ <eugenePluginVersion>3.0-alpha-3</eugenePluginVersion> <topiaVersion>3.1-SNAPSHOT</topiaVersion> - <jaxxVersion>2.24</jaxxVersion> + <jaxxVersion>2.25</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- 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 in repository observe. See http://git.codelutin.com/observe.git commit e288eba6fe1fa5795bced50b9420e049d810b3fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:58:44 2015 +0200 Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) --- .../ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java | 5 +++++ .../ui/content/open/impl/longline/ActivityLonglineUIHandler.java | 2 ++ .../observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java | 2 ++ .../ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 102ccf2..7687c39 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -190,6 +190,11 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { @Override public void openUI() throws Exception { + getUi().getSettingStartCoordinates().resetModel(); + getUi().getSettingEndCoordinates().resetModel(); + getUi().getHaulingStartCoordinates().resetModel(); + getUi().getHaulingEndCoordinates().resetModel(); + // Reset quandrant resetQuadrant(getUi().getSettingStartCoordinates()); resetQuadrant(getUi().getSettingEndCoordinates()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 59094f0..910615e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -143,6 +143,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity public void openUI() throws Exception { super.openUI(); + getUi().getCoordinatesEditor().resetModel(); + resetQuadrant(getUi().getCoordinatesEditor()); String tripId = getSelectedParentId(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 4ad839f..42901f0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -170,6 +170,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public void openUI() throws Exception { super.openUI(); + getUi().getCoordinatesEditor().resetModel(); + resetQuadrant(getUi().getCoordinatesEditor()); String routeId = getSelectedParentId(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index 5a5e851..dc7825f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -97,7 +97,7 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeine> BinderModelBuilder<ActivitySeine, ActivitySeine> builder = binderService.newBinderBuilder( ActivitySeine.class, - ActivitySeine.PROPERTY_QUADRANT, +// ActivitySeine.PROPERTY_QUADRANT, ActivitySeine.PROPERTY_LATITUDE, ActivitySeine.PROPERTY_LONGITUDE, ActivitySeine.PROPERTY_ERS_ID, -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 1d531657c3cc9e7c63e3539f2430fa808a6bce0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:05:46 2015 +0200 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (termine #7486) --- observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java index 9350fab..23f6781 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java @@ -349,7 +349,7 @@ public abstract class PGInstall { protected Set<String> getPostgisFunctions(Connection conn, String functionPattern) throws SQLException { final Set<String> result = new LinkedHashSet<String>(); - String sql = String.format("SELECT format('%%I.%%I(%%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes))" + + String sql = String.format("SELECT ns.nspname::text || '.' || p.proname::text || '(' || oidvectortypes(p.proargtypes)::text || ')'" + " FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)" + " WHERE ns.nspname = 'public' AND p.proname ILIKE '%s%%';", functionPattern); PreparedStatement sta = -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 7cf06e3fe662feec29f33f15766438cd08c7ae1e 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 in repository observe. See http://git.codelutin.com/observe.git commit 1a2fc2aad94701df72dc4e9b49d83fd6641f1fe8 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 | 20 ++++-- .../DataSourceMigrationForVersion_4_0_2.java | 75 ++++++++++++++++++++++ .../{4.0.1 => 4.0.2}/remove-gender-column-PG.sql | 2 +- 4 files changed, 93 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 d711e3a..34d7e84 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 @@ -85,10 +85,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_5_0 + 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_5_0 }; protected ObserveTopiaApplicationContext topiaApplicationContext; 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 b4c6ebb..232113f 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 @@ -24,15 +24,16 @@ package fr.ird.observe.entities.migration.versions; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -import fr.ird.observe.ObserveTopiaIdFactory; 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 fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.topia.persistence.support.TopiaSqlWork; +import org.hibernate.jdbc.Work; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaId; import java.sql.Connection; import java.sql.PreparedStatement; @@ -63,9 +64,6 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv boolean showSql, boolean showProgression) { - // 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); @@ -182,6 +180,16 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } @Override + protected void prepareMigrationScript(TopiaSqlSupport 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(TopiaSqlSupport 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 -- 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 in repository observe. See http://git.codelutin.com/observe.git commit c17da19687c2ad7919aea320008e1c79afa0e94f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:47:58 2015 +0200 Utilisation du type Long --- observe-entities/src/main/xmi/observe-common.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 6ccdc4b..8d226e9 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -27,7 +27,7 @@ model.tagvalue.attributeType.String=java.lang.String model.tagvalue.attributeType.Float=java.lang.Float model.tagvalue.attributeType.Integer=java.lang.Integer model.tagvalue.attributeType.Boolean=java.lang.Boolean -model.tagvalue.attributeType.Long=long +model.tagvalue.attributeType.Long=java.lang.Long ############################################################################### ### Schema #################################################################### -- 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 in repository observe. See http://git.codelutin.com/observe.git commit fffcdeeb3d862f0bbeb33c5a5fdd128a10da6b90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:48:17 2015 +0200 Ne pas ajouter aux requetes de migrations les commentaires --- .../AbstractObserveMigrationCallBack.java | 34 +++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index 9819d82..e3b7c7e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -40,6 +40,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -65,21 +66,28 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal String migrationScript = prefix + "-" + scriptSuffix + ".sql"; String scriptPath = "/db/" + version.getVersion() + "/" + migrationScript; + if (log.isInfoEnabled()) { - log.info("Will will load migration script: "+scriptPath); + log.info("Will will load migration script: " + scriptPath); } - InputStream stream = getClass().getResourceAsStream(scriptPath); - String content; - try { - content = IOUtils.toString(stream, Charsets.UTF_8); - stream.close(); + + try (InputStream stream = getClass().getResourceAsStream(scriptPath)) { + String content = IOUtils.toString(stream, Charsets.UTF_8); + Set<String> result = new LinkedHashSet<>(); + for (String statement : content.split("\n")) { + + if (statement.startsWith("--")) { + // commentaire + continue; + } + result.add(statement); + } + + return result.toArray(new String[result.size()]); } catch (IOException e) { throw new TopiaException("Could not load migration script: " + migrationScript, e); - } finally { - IOUtils.closeQuietly(stream); } - return content.split("\n"); } @@ -111,9 +119,9 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal } protected void addScript(String prefix, List<String> queries) { - { - String[] migrationQueries = loadScript(prefix); - queries.addAll(Lists.newArrayList(migrationQueries)); - } + + String[] migrationQueries = loadScript(prefix); + queries.addAll(Lists.newArrayList(migrationQueries)); + } } -- 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 in repository observe. See http://git.codelutin.com/observe.git commit ca2178defddb1e397383ec702d5be3921011722c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:48:33 2015 +0200 Correction de l'api de migration suite au cherry-pcik --- .../migration/versions/DataSourceMigrationForVersion_4_0_1.java | 8 ++++---- .../migration/versions/DataSourceMigrationForVersion_4_0_2.java | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) 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 232113f..3ec6a85 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 @@ -24,16 +24,16 @@ package fr.ird.observe.entities.migration.versions; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; +import fr.ird.observe.ObserveTopiaIdFactory; 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 fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; 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 index 3cee5c7..c6b285d 100644 --- 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 @@ -26,8 +26,7 @@ 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 org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -50,7 +49,7 @@ public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserv } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + protected void prepareMigrationScript(TopiaSqlSupport tx, List<String> queries, boolean showSql, boolean showProgression) { // Rien à faire (déjà fait en 4.0.1) } @@ -63,7 +62,7 @@ public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserv } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + protected void prepareMigrationScript(TopiaSqlSupport tx, List<String> queries, boolean showSql, boolean showProgression) { // See http://forge.codelutin.com/issues/7467 addScript("remove-gender-column", queries); -- 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