- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch release/9.1.4
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT deleted branch release/9.1.4 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.1.4
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed new tag v9.1.4 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.1.4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.1.4] [jgitflow-maven-plugin]updating poms for branch'release/9.1.4' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch release/9.1.4 at ultreiaio / ird-observe Commits: f5d256d7 by Tony Chemit at 2023-06-01T20:02:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.4' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f5d256d748117800cdb033afe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f5d256d748117800cdb033afe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 16 commits: [jgitflow-maven-plugin]updating poms for 9.1.4-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b6268dbd by Tony Chemit at 2023-05-20T13:08:20+02:00 [jgitflow-maven-plugin]updating poms for 9.1.4-SNAPSHOT development[skip ci] - - - - - e238ff6c by Tony Chemit at 2023-05-20T13:36:06+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3eca5101 by Tony Chemit at 2023-05-20T13:36:07+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 73562b88 by Tony Chemit at 2023-05-20T13:36:09+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 60592362 by Tony Chemit at 2023-05-21T15:56:21+02:00 Toolkit service API - Improve UsageService API (add static method for inner invocation from another service to avoid a new service instantiation) Toolkit service API - Clean UsageCount objects - - - - - f36333ee by Tony Chemit at 2023-05-22T13:48:01+02:00 Toolkit persistence API - Fix bad find in usageHelper : we need to add result in a set, because atomic usage queries might produce many time the same usage and we do not want this (See #2705) Toolkit persistence API - Fix bad count in usageHelper : we need when counting usages to get actually the ids and preserve them in a set, because atomic usage queries might produce many time the same usage and we do not want this (See #2705) Toolkit persistence API - Improve UsageHelper API: add method count with a possible predicate on links type to count - - - - - 33ccb410 by Tony Chemit at 2023-05-22T13:48:01+02:00 Toolkit service API - Improve UsageService API: add method countReferentialInData - - - - - 71546d08 by Tony Chemit at 2023-05-22T13:48:01+02:00 Improve replace referential API to be able to replace in referential and data or only in data - See #2702 - - - - - 0eb38fab by Tony Chemit at 2023-05-25T15:20:20+02:00 Add new action to replace referential usages only in data - Closes #2702 - - - - - d81054c9 by Tony Chemit at 2023-05-31T09:41:28+02:00 fix some vulnerabilities in transitive dependencies tidy pom update pom fix some compile dependencies - - - - - bc7dea2b by Tony Chemit at 2023-05-31T10:17:16+02:00 Assistant sauvegarde qui ne zippe pas les bases - Closes #2709 - - - - - ae2de0ba by Tony Chemit at 2023-06-01T08:38:15+02:00 Table de versionnage non présente dans certaines sauvegardes (depuis la version 9.0.X jusqu'à la 9.1.3) - Closes #2712 - - - - - bc001283 by Tony Chemit at 2023-06-01T17:53:06+02:00 Update changelog for v.9.1.4 [skip CI] - - - - - 023f421b by Tony Chemit at 2023-06-01T17:54:44+02:00 [jgitflow-maven-plugin]updating poms for 9.1.4 branch with snapshot versions[skip ci] - - - - - f5d256d7 by Tony Chemit at 2023-06-01T20:02:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.4' with non-snapshot versions[skip ci] - - - - - d196e001 by Tony Chemit at 2023-06-01T20:30:06+02:00 [jgitflow-maven-plugin]merging 'release/9.1.4' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ReplaceReferentialUsages.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForReplaceUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForReplaceUIHandler.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/340629208808782f3a2ae63e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/340629208808782f3a2ae63e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 9.1.4 branch with snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 023f421b by Tony Chemit at 2023-06-01T17:54:44+02:00 [jgitflow-maven-plugin]updating poms for 9.1.4 branch with snapshot versions[skip ci] - - - - - f5d256d7 by Tony Chemit at 2023-06-01T20:02:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.4' with non-snapshot versions[skip ci] - - - - - d196e001 by Tony Chemit at 2023-06-01T20:30:06+02:00 [jgitflow-maven-plugin]merging 'release/9.1.4' into 'master' - - - - - 69c463a1 by Tony Chemit at 2023-06-01T20:30:18+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9a2a8d2a by Tony Chemit at 2023-06-01T20:30:20+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c85a2bf2 by Tony Chemit at 2023-06-01T20:30:23+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0cb3ca2fc2654b30589ec16f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0cb3ca2fc2654b30589ec16f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.4
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed new branch release/9.1.4 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.1.4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.1.5-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0cb3ca2f by Tony Chemit at 2023-06-01T17:54:47+02:00 [jgitflow-maven-plugin]updating poms for 9.1.5-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0cb3ca2fc2654b30589ec16fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0cb3ca2fc2654b30589ec16fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.1.4 [skip CI]
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc001283 by Tony Chemit at 2023-06-01T17:53:06+02:00 Update changelog for v.9.1.4 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,23 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-05-20 13:06. + * Last generated at 2023-06-01 17:39. + +## Version [9.1.4](https://gitlab.com/ultreiaio/ird-observe/-/milestones/267) + +**Closed at 2023-06-01.** + +### Download +* [Client (observe-9.1.4-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.4.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.4-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[Type::Anomalie 2705]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2705) **Les résultats des utilisations d'un référentiel peuvent être améliorés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2709]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2709) **Assistant sauvegarde qui ne zippe pas les bases** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2712]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2712) **Table de versionnage non présente dans certaines sauvegardes (depuis la version 9.0.X jusqu'à la 9.1.3)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2702]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2702) **Permettre le remapping de code, même sans avoir à demander une désactivation ou une suppression de référence** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.1.3](https://gitlab.com/ultreiaio/ird-observe/-/milestones/266) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bc001283bb11d50183b715e63… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bc001283bb11d50183b715e63… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Table de versionnage non présente dans certaines sauvegardes (depuis la...
by Tony CHEMIT (＠tchemit) June 1, 2023

June 1, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ae2de0ba by Tony Chemit at 2023-06-01T08:38:15+02:00 Table de versionnage non présente dans certaines sauvegardes (depuis la version 9.0.X jusqu'à la 9.1.3) - Closes #2712 - - - - - 1 changed file: - toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/TopiaMigrationServiceContext.java Changes: ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/TopiaMigrationServiceContext.java ===================================== @@ -38,6 +38,7 @@ import org.nuiton.topia.service.migration.version.TMSVersion; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.sql.SQLException; import java.util.Date; import java.util.List; import java.util.Objects; @@ -149,14 +150,15 @@ public class TopiaMigrationServiceContext { } } finally { if (v == null) { - //FIXME Is this can really happen? - // la base dans ce cas n'est pas versionee. - // On dit que la version de la base est 0 - // et les schema de cette version 0 doivent - // etre detenu en local - v = Version.VZERO; + // If no version found, db not versioned dbNotVersioned = true; - log.info("Database version not found, so database schema is considered as V0"); + try { + // We can still try to detect database version from the structure of the database + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2712 + v = detectVersionFromStructure(jdbcHelper); + log.warn("Database version table not found, but database version was guessed : {}", v); + } catch (SQLException ignored) { + } } else { log.info(String.format("Detected database version: %s", v)); } @@ -173,6 +175,25 @@ public class TopiaMigrationServiceContext { ); } + private static Version detectVersionFromStructure(JdbcHelper jdbcHelper) throws SQLException { + if (!jdbcHelper.isSchemaExist("ps_logbook")) { + // We are before v9.0 + return Version.valueOf("7.6"); + } + // try to detect v9.0 + if (jdbcHelper.isTableExist("ps_logbook", "wellPlan")) { + // We are on a version 9.0.x + return Version.valueOf("9.0"); + } + // try to detect v9.1 + if (jdbcHelper.isTableExist("ps_logbook", "well")) { + // We are on a version 9.1.x + return Version.valueOf("9.1"); + } + // We could not find the database version + throw new TopiaMigrationServiceException("Could not detected database version, no migration table found."); + } + public static TopiaMigrationServiceContext createLegacy(TopiaMigrationServiceConfiguration configuration) { TopiaApplicationContext<?> topiaApplicationContext = configuration.getApplicationContext(); boolean versionTableExist; @@ -303,9 +324,14 @@ public class TopiaMigrationServiceContext { log.info("Fill version table {} from legacy table.", dbVersion); saveVersion(sqlSupport, dbVersion, null); } else if (dbNotVersioned) { - log.info("Database is empty, no migration needed, set "); - saveVersion(sqlSupport, modelVersion, new Date()); - return false; + if (Version.VZERO.equals(dbVersion)) { + log.info("Database is empty, no migration needed, set current version {}", modelVersion); + saveVersion(sqlSupport, modelVersion, new Date()); + return false; + } else { + log.info("Fill version table {} from guessed version (even if no legacy nor default version table detected).", dbVersion); + saveVersion(sqlSupport, dbVersion, null); + } } // In all other cases, we can try to perform migration return true; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ae2de0ba743821f3886d03e68… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ae2de0ba743821f3886d03e68… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Table de versionnage non présente dans certaines sauvegardes (depuis la...
by Tony CHEMIT (＠tchemit) May 31, 2023

May 31, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c54977df by Tony Chemit at 2023-05-31T20:29:11+02:00 Table de versionnage non présente dans certaines sauvegardes (depuis la version 9.0.X jusqu'à la 9.1.3) - Closes #2712 - - - - - 1 changed file: - toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/TopiaMigrationServiceContext.java Changes: ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/TopiaMigrationServiceContext.java ===================================== @@ -38,6 +38,7 @@ import org.nuiton.topia.service.migration.version.TMSVersion; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.sql.SQLException; import java.util.Date; import java.util.List; import java.util.Objects; @@ -149,19 +150,40 @@ public class TopiaMigrationServiceContext { } } finally { if (v == null) { - //FIXME Is this can really happen? - // la base dans ce cas n'est pas versionee. - // On dit que la version de la base est 0 - // et les schema de cette version 0 doivent - // etre detenu en local - v = Version.VZERO; + // If no version found, db not versioned dbNotVersioned = true; - log.info("Database version not found, so database schema is considered as V0"); + // This case should never happen :( but v9.0.x is sometime without versioning table + // We can still try to find db version from database structure + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2712 + try { + // try to detect v9.0 + if (jdbcHelper.isTableExist("ps_logbook", "wellPlan")) { + // We are on a version 9.0.x + v = Version.valueOf("9.0"); + } + } catch (SQLException ignored) { + } + if (v == null) { + // try to detect v9.1 + try { + if (jdbcHelper.isTableExist("ps_logbook", "well")) { + // We are on a version 9.0.x + v = Version.valueOf("9.1"); + } + } catch (SQLException ignored) { + } + } + if (v != null) { + log.warn("Database version table not found, but database version was guessed : {}", v); + } } else { log.info(String.format("Detected database version: %s", v)); } dbVersion = v; } + if (dbVersion == null) { + throw new TopiaMigrationServiceException("Could not detected database version, no migration table found."); + } return new TopiaMigrationServiceContext(configuration, sqlHelper, legacyVersionTableExist, @@ -303,9 +325,14 @@ public class TopiaMigrationServiceContext { log.info("Fill version table {} from legacy table.", dbVersion); saveVersion(sqlSupport, dbVersion, null); } else if (dbNotVersioned) { - log.info("Database is empty, no migration needed, set "); - saveVersion(sqlSupport, modelVersion, new Date()); - return false; + if (Version.VZERO.equals(dbVersion)) { + log.info("Database is empty, no migration needed, set current version {}", modelVersion); + saveVersion(sqlSupport, modelVersion, new Date()); + return false; + } else { + log.info("Fill version table {} from guessed version (even if no legacy nor default version table detected).", dbVersion); + saveVersion(sqlSupport, dbVersion, null); + } } // In all other cases, we can try to perform migration return true; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c54977dfe4c1f12226c1336a3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c54977dfe4c1f12226c1336a3… You're receiving this email because of your account on gitlab.com.

1 0