Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d18c3fd by Tony Chemit at 2021-04-26T15:37:12+02:00 Détection d'une base de version supérieure (always use application model to service configuration) - See #1831 - - - - - 253bc507 by Tony Chemit at 2021-04-26T15:37:12+02:00 update gitignore - - - - - 2 changed files: - .gitignore - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java Changes: ===================================== .gitignore ===================================== @@ -8,6 +8,10 @@ /*/*/*/*/target/ /*.iml /*/*.iml +/*/*/*.iml +/*/*/*/*.iml +/*/*/*/*/*.iml +/*/*/*/*/*/*.iml /*.ipr /*/*.ipr /*.iws ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java ===================================== @@ -328,7 +328,8 @@ public class DataSourceHelper { h2Config.getPassword(), h2Config.isShowMigrationProgression(), h2Config.isShowMigrationSql(), - h2Config.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -343,7 +344,8 @@ public class DataSourceHelper { pgConfig.isUseSsl(), pgConfig.isShowMigrationProgression(), pgConfig.isShowMigrationSql(), - pgConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -356,7 +358,8 @@ public class DataSourceHelper { restConfig.getLogin(), restConfig.getPassword(), restConfig.getOptionalDatabaseName().orElse(null), - restConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c200daeca1160f544599b2cfa... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c200daeca1160f544599b2cfa... You're receiving this email because of your account on gitlab.com.