Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
5d18c3fd
by Tony Chemit at 2021-04-26T15:37:12+02:00
-
253bc507
by Tony Chemit at 2021-04-26T15:37:12+02:00
2 changed files:
- .gitignore
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java
Changes:
| ... | ... | @@ -8,6 +8,10 @@ |
| 8 | 8 |
/*/*/*/*/target/
|
| 9 | 9 |
/*.iml
|
| 10 | 10 |
/*/*.iml
|
| 11 |
+/*/*/*.iml
|
|
| 12 |
+/*/*/*/*.iml
|
|
| 13 |
+/*/*/*/*/*.iml
|
|
| 14 |
+/*/*/*/*/*/*.iml
|
|
| 11 | 15 |
/*.ipr
|
| 12 | 16 |
/*/*.ipr
|
| 13 | 17 |
/*.iws
|
| ... | ... | @@ -328,7 +328,8 @@ public class DataSourceHelper { |
| 328 | 328 |
h2Config.getPassword(),
|
| 329 | 329 |
h2Config.isShowMigrationProgression(),
|
| 330 | 330 |
h2Config.isShowMigrationSql(),
|
| 331 |
- h2Config.getModelVersion()
|
|
| 331 |
+ //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required
|
|
| 332 |
+ model.getModelVersion()
|
|
| 332 | 333 |
);
|
| 333 | 334 |
}
|
| 334 | 335 |
|
| ... | ... | @@ -343,7 +344,8 @@ public class DataSourceHelper { |
| 343 | 344 |
pgConfig.isUseSsl(),
|
| 344 | 345 |
pgConfig.isShowMigrationProgression(),
|
| 345 | 346 |
pgConfig.isShowMigrationSql(),
|
| 346 |
- pgConfig.getModelVersion()
|
|
| 347 |
+ //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required
|
|
| 348 |
+ model.getModelVersion()
|
|
| 347 | 349 |
);
|
| 348 | 350 |
}
|
| 349 | 351 |
|
| ... | ... | @@ -356,7 +358,8 @@ public class DataSourceHelper { |
| 356 | 358 |
restConfig.getLogin(),
|
| 357 | 359 |
restConfig.getPassword(),
|
| 358 | 360 |
restConfig.getOptionalDatabaseName().orElse(null),
|
| 359 |
- restConfig.getModelVersion()
|
|
| 361 |
+ //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required
|
|
| 362 |
+ model.getModelVersion()
|
|
| 360 | 363 |
);
|
| 361 | 364 |
}
|
| 362 | 365 |
}
|