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 a5b99ae55bf3195cc4f632285b5212602f774537 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 20:21:24 2015 +0200 ajout de migration des ids défaillants (refs #7142) --- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 50 ++++++++++++++++++++++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 5 +++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 5 +++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 3 +- 7 files changed, 66 insertions(+), 5 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 da55de9..e1c4d98 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 @@ -81,9 +81,11 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_RC4 = Versions.valueOf("4.0-RC4"); + public static final Version V_4_0_RC6 = Versions.valueOf("4.0-RC6"); + /** 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_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 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java new file mode 100644 index 0000000..886027e --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java @@ -0,0 +1,50 @@ +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.PGDataSourceMigration; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.util.List; + +/** + * Created on 5/22/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0-RC6 + */ +public class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_0_RC6(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_0_RC6, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + // See https://forge.codelutin.com/issues/7142 + addScript("fix-gearUseFeatures-topiaIds", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC6 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC6 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } +} diff --git a/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql b/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql new file mode 100644 index 0000000..86a0347 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql @@ -0,0 +1,5 @@ +UPDATE OBSERVE_SEINE.gearusefeaturesmeasurement SET topiaid = replace(topiaid, 'GearUseFeaturesMeasurement#', 'GearUseFeaturesMeasurementSeine#'); +ALTER TABLE OBSERVE_SEINE.gearusefeaturesmeasurement DROP CONSTRAINT fk_gearusefeaturesmeasurement_gearusefeatures; +UPDATE OBSERVE_SEINE.gearusefeaturesmeasurement SET gearUseFeatures = replace(gearUseFeatures, 'GearUseFeatures#', 'GearUseFeaturesSeine#'); +UPDATE OBSERVE_SEINE.gearusefeatures SET topiaid = replace(topiaid, 'GearUseFeatures#', 'GearUseFeaturesSeine#'); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT fk_gearusefeaturesmeasurement_gearusefeatures FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql b/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql new file mode 100644 index 0000000..86a0347 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql @@ -0,0 +1,5 @@ +UPDATE OBSERVE_SEINE.gearusefeaturesmeasurement SET topiaid = replace(topiaid, 'GearUseFeaturesMeasurement#', 'GearUseFeaturesMeasurementSeine#'); +ALTER TABLE OBSERVE_SEINE.gearusefeaturesmeasurement DROP CONSTRAINT fk_gearusefeaturesmeasurement_gearusefeatures; +UPDATE OBSERVE_SEINE.gearusefeaturesmeasurement SET gearUseFeatures = replace(gearUseFeatures, 'GearUseFeatures#', 'GearUseFeaturesSeine#'); +UPDATE OBSERVE_SEINE.gearusefeatures SET topiaid = replace(topiaid, 'GearUseFeatures#', 'GearUseFeaturesSeine#'); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT fk_gearusefeaturesmeasurement_gearusefeatures FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); \ 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 47d09fb..a7063d7 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-RC4 +model.tagvalue.version=4.0-RC6 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 14871b1..0d07441 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-RC4 +model.tagvalue.version=4.0-RC6 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 56c5db0..28ad352 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -19,8 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### - -model.tagvalue.version=4.0-RC4 +model.tagvalue.version=4.0-RC6 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>.