This is an automated email from the git hooks/post-receive script. New change to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3ebbf63 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). new e0668af Ajout d'un migration pour supprimer la colonne "unit" de la table "observe_common.gearcaracteristictype" (see #8137). new 82d103c dans le service de generation des Dump de base de donnée, n'exposer qu'une methode générique (see #8124). new 02829f5 créer le repertoire temporaire si il n'existe pas (see #8124). 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 02829f538e12a222fbbcb1081366690533f9d5e0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:49:32 2016 +0100 créer le repertoire temporaire si il n'existe pas (see #8124). commit 82d103cc9ef739e5169496d5dd30463da21b1f6c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:46:57 2016 +0100 dans le service de generation des Dump de base de donnée, n'exposer qu'une methode générique (see #8124). commit e0668af94f1132a3560a76b6150e2c0c21acb383 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:44:06 2016 +0100 Ajout d'un migration pour supprimer la colonne "unit" de la table "observe_common.gearcaracteristictype" (see #8137). Summary of changes: .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 6 ++- .../fr/ird/observe/ui/storage/StorageUIModel.java | 5 +- .../migration/AbstractDataSourceMigration.java | 3 +- ...va => DataSourceMigrationForVersion_4_903.java} | 12 ++--- .../migration/V4_903_01_remove_unit_field-H2.sql | 1 + .../migration/V4_903_01_remove_unit_field-PG.sql | 1 + .../services/ObserveServiceInitializer.java | 3 ++ .../services/service/SqlScriptProducerService.java | 13 ----- .../services/service/DataSourceServiceTopia.java | 9 ++-- .../service/SqlScriptProducerServiceTopia.java | 61 ---------------------- .../services/service/MigrateTestsDatabases.java | 15 ++++-- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- pom.xml | 2 +- 15 files changed, 44 insertions(+), 96 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_902.java => DataSourceMigrationForVersion_4_903.java} (86%) create mode 100644 observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e0668af94f1132a3560a76b6150e2c0c21acb383 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:44:06 2016 +0100 Ajout d'un migration pour supprimer la colonne "unit" de la table "observe_common.gearcaracteristictype" (see #8137). --- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_903.java | 72 ++++++++++++++++++++++ .../migration/V4_903_01_remove_unit_field-H2.sql | 1 + .../migration/V4_903_01_remove_unit_field-PG.sql | 1 + .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- pom.xml | 2 +- 6 files changed, 78 insertions(+), 3 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 7f5840c..c78e41c 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 @@ -72,6 +72,7 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_900 = Versions.valueOf("4.900"); 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"); // FIXME A utiliser en version final 5.0 public static final Version V_5_0 = Versions.valueOf("5.0"); @@ -82,7 +83,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_900, V_4_901, V_4_902, V_4_903 // 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_903.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java new file mode 100644 index 0000000..08b2cff --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java @@ -0,0 +1,72 @@ +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 25/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class DataSourceMigrationForVersion_4_903 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_4_903(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_903, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + // Ajout de la table lastUpdateDate + // See https://forge.codelutin.com/issues/7470 + addScript("01", "remove_unit_field", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql b/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql new file mode 100644 index 0000000..d8aa647 --- /dev/null +++ b/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql @@ -0,0 +1 @@ +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS UNIT; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql b/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql new file mode 100644 index 0000000..d8aa647 --- /dev/null +++ b/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql @@ -0,0 +1 @@ +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE DROP COLUMN IF EXISTS UNIT; \ No newline at end of file diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java index 3bb709f..e4ad683 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -16,7 +16,7 @@ public class ObserveFixtures { public static final String PREVIOUS_DEFAULT_VERSION = "4.0.1"; - public static final String DEFAULT_VERSION = "4.902"; + public static final String DEFAULT_VERSION = "4.903"; public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; diff --git a/pom.xml b/pom.xml index 4e85526..be0aba9 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.902</observe.model.version> + <observe.model.version>4.903</observe.model.version> </properties> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 82d103cc9ef739e5169496d5dd30463da21b1f6c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:46:57 2016 +0100 dans le service de generation des Dump de base de donnée, n'exposer qu'une methode générique (see #8124). --- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 6 ++- .../fr/ird/observe/ui/storage/StorageUIModel.java | 5 +- .../services/service/SqlScriptProducerService.java | 13 ----- .../services/service/DataSourceServiceTopia.java | 9 ++-- .../service/SqlScriptProducerServiceTopia.java | 61 ---------------------- .../services/service/MigrateTestsDatabases.java | 15 ++++-- 8 files changed, 29 insertions(+), 87 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 9c2a7fa..324c508 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -30,6 +30,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.admin.config.SelectDataUI; @@ -129,7 +130,8 @@ public class AdminTabUIHandler { // on replique les données specifiees ImmutableSet<String> dataIds = ImmutableSet.<String>copyOf(tripIds); - byte[] dataDump = sqlScriptProducerService.getDataDump(dataIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(dataIds); + byte[] dataDump = sqlScriptProducerService.produceSqlScript(request); source.close(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java index 6bef01e..18219c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java @@ -162,7 +162,8 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { File backupFile = stepModel.getBackupFile(); SqlScriptProducerService dumpService = source.newSqlScriptProducerService(); - byte[] dump = dumpService.getAllDataDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); + byte[] dump = dumpService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(backupFile)) { IOUtils.write(dump, outputStream); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 4856d7a..69808fd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -612,7 +612,8 @@ public class StorageUIHandler { log.debug(dst); } - byte[] dataDump = dumpProducerService.getAllDataDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); + byte[] dataDump = dumpProducerService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { @@ -667,7 +668,8 @@ public class StorageUIHandler { ImmutableSet<String> tripIds = ImmutableSet.copyOf(Iterables.transform(trips, DataReference.getIdFunction())); - byte[] dump = dumpService.getDataDump(tripIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(tripIds); + byte[] dump = dumpService.produceSqlScript(request); try (FileOutputStream fileOutputStream = new FileOutputStream(dst)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 51189bc..db85de9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -48,6 +48,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.PingService; +import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.storage.tabs.SecurityModel; @@ -1591,7 +1592,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { SqlScriptProducerService dumpService = source.newService(SqlScriptProducerService.class); - byte[] dump = dumpService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential(); + byte[] dump = dumpService.produceSqlScript(request); + result.setImportDatabase(dump); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java index c370a36..2925ad5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.service; -import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; /** @@ -10,17 +9,5 @@ import fr.ird.observe.services.ObserveService; */ public interface SqlScriptProducerService extends ObserveService { - byte[] getH2Schema(); - - byte[] getPostgresSchema(); - - byte[] getReferentialDump(); - - byte[] getDataDump(ImmutableSet<String> dataIds); - - byte[] getAllDataDump(); - - byte[] getDump(); - byte[] produceSqlScript(SqlScriptProducerRequest request); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 9f91b5d..676d7ad 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -207,7 +207,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS ObserveDataSourceConfiguration importDataSourceConfiguration = dataSourceCreateConfiguration.getImportReferentialDataSourceConfiguration(); SqlScriptProducerService dumpProducerService = serviceContext.newService(importDataSourceConfiguration, SqlScriptProducerService.class); - byte[] referentialDump = dumpProducerService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); + byte[] referentialDump = dumpProducerService.produceSqlScript(request); topiaApplicationContext.executeSqlStatements(referentialDump); referantialImported = true; @@ -227,7 +228,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } // Réplication du référentiel - byte[] referentialDump = dumpProducerService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); + byte[] referentialDump = dumpProducerService.produceSqlScript(request); if (log.isInfoEnabled()) { log.info("Import referential."); @@ -243,7 +245,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS log.info("Get data: " + importDataIds); } - byte[] dataDump = dumpProducerService.getDataDump(importDataIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(importDataIds); + byte[] dataDump = dumpProducerService.produceSqlScript(request); if (log.isInfoEnabled()) { log.info("Import data."); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java index 73ebe38..30b7896 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.service; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -54,66 +53,6 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } - @Override - public byte[] getH2Schema() { - if (log.isTraceEnabled()) { - log.trace("getH2Schema()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema(); - return produceSqlScript(request); - } - - @Override - public byte[] getPostgresSchema() { - if (log.isTraceEnabled()) { - log.trace("getPostgresSchema()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forPostgres().addSchema(); - return produceSqlScript(request); - } - - @Override - public byte[] getReferentialDump() { - if (log.isTraceEnabled()) { - log.trace("getReferentialDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); - return produceSqlScript(request); - } - - @Override - public byte[] getDataDump(ImmutableSet<String> dataIds) { - if (log.isTraceEnabled()) { - log.trace("getDataDump([" + Joiner.on(", ").join(dataIds) + "])"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(dataIds); - return produceSqlScript(request); - } - - @Override - public byte[] getAllDataDump() { - if (log.isTraceEnabled()) { - log.trace("getAllDataDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); - return produceSqlScript(request); - } - - @Override - public byte[] getDump() { - if (log.isTraceEnabled()) { - log.trace("getDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); - return produceSqlScript(request); - } - protected SqlRequests sqlRequests(SqlScriptProducerRequest request, SqlRequests.Builder builder) { if (request.isAddSchema()) { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java index fdebd1a..7bbf6f4 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java @@ -41,31 +41,36 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test public void migrateEmptyH2Db() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getH2Schema()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test public void migrateEmptyPgDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(DatabaseName.empty_pg.name(), service.getPostgresSchema()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forPostgres().addSchema(); + migrate(DatabaseName.empty_pg.name(), service.produceSqlScript(request)); } protected void migrate(byte[] dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 02829f538e12a222fbbcb1081366690533f9d5e0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:49:32 2016 +0100 créer le repertoire temporaire si il n'existe pas (see #8124). --- .../main/java/fr/ird/observe/services/ObserveServiceInitializer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 70d033e..525951f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -166,6 +166,9 @@ public class ObserveServiceInitializer { } public File getTemporaryDirectoryRoot() { + if (! temporaryDirectoryRoot.exists()) { + temporaryDirectoryRoot.mkdirs(); + } return temporaryDirectoryRoot; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm