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 4e94dcfc2e9269670c90b31360008d83562496a0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 16 16:50:26 2016 +0100 Créer la base local avant de generer son dump initial (see #8124). --- .../ird/observe/ui/storage/StorageUIHandler.java | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) 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 69808fd..15ab933 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 @@ -510,6 +510,16 @@ public class StorageUIHandler { observeContext.setDataSource(currentDataSource); observeContext.prepareMainStorage(currentDataSource); + if (model.getDbMode() == DbMode.CREATE_LOCAL) { + + DataSourceCreateConfigurationDto creationConfigurationDto = model.getCreationConfigurationDto(); + + currentDataSource.create(creationConfigurationDto); + } else { + // ouverture du nouveau storage + currentDataSource.open(); + } + if (DbMode.CREATE_LOCAL.equals(model.getDbMode()) && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) && config.isLocalStorageExist()) { @@ -540,22 +550,6 @@ public class StorageUIHandler { } } - - if (model.getDbMode() == DbMode.CREATE_LOCAL) { - - DataSourceCreateConfigurationDto creationConfigurationDto = model.getCreationConfigurationDto(); - - currentDataSource.create(creationConfigurationDto); - } else { - // ouverture du nouveau storage - currentDataSource.open(); - } - - - - - - if (log.isInfoEnabled()) { log.info(">>> main storage opened " + currentDataSource.getLabel()); } @@ -612,7 +606,7 @@ public class StorageUIHandler { log.debug(dst); } - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); byte[] dataDump = dumpProducerService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.