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

[Git][ultreiaio/ird-observe][feature/issue-2829] 33 commits: update pom
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch feature/issue-2829 at ultreiaio / ird-observe Commits: 01819545 by Tony Chemit at 2024-01-18T10:23:06+01:00 update pom - - - - - 1640c13a by Tony Chemit at 2024-01-18T10:23:06+01:00 [toolkit-maven-plugin] Add more actions in GenerateMigrationScriptRunner - - - - - d4cb0767 by Tony Chemit at 2024-01-18T10:23:06+01:00 [toolkit-persistence] Open MigrationVersionResourceExecutor.isPg method - - - - - a5e30651 by Tony Chemit at 2024-01-18T10:23:32+01:00 [model] Rename Set to FishingSet - - - - - 108698fa by Tony Chemit at 2024-01-18T10:23:32+01:00 [model] Update fixtures - - - - - dc8d6b7b by Tony Chemit at 2024-01-18T10:23:32+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - 5552635a by Tony Chemit at 2024-01-18T10:23:32+01:00 [core-api] Update dto - - - - - e8f4e8f6 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-api] Update decorators - - - - - c15a72a2 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-api] Update validators - - - - - 55bc3777 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-api] Update tree mapping - - - - - ed7ef775 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-api] Update validation - - - - - d22b7902 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-api] Update services - - - - - 389fb60f by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update entities - - - - - c353995b by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update decorators - - - - - 41b97e0c by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Add migration - - - - - 23b9fb64 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update report definitions - - - - - 84bced7e by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update consolidation conde - - - - - 769d5d52 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update resources - - - - - 3b95e496 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-persistence] Update tests - - - - - 7ca64859 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-services] Update i18n - - - - - 67fc3dd5 by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-services] Update TripServiceLocal - - - - - 424b4feb by Tony Chemit at 2024-01-18T10:23:33+01:00 [core-services] Update tests fixtures - - - - - ded6ff4a by Tony Chemit at 2024-01-18T10:23:33+01:00 [server] Update mapping - - - - - d5daa548 by Tony Chemit at 2024-01-18T10:23:33+01:00 [server] Update public API documentation - - - - - 69134595 by Tony Chemit at 2024-01-18T10:23:33+01:00 [client] Update default swing Preferences - - - - - d98a938c by Tony Chemit at 2024-01-18T10:23:33+01:00 [client] Update data source editor SPI - - - - - 7047d99e by Tony Chemit at 2024-01-18T10:23:33+01:00 [client] Update ps module - - - - - 1bc14cd0 by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] Update ll module - - - - - 28b6f0b6 by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] clean DataSourceEditor.jaxx file - - - - - d61129d6 by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] update pg scripts - - - - - ea5c9452 by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] update i18n - - - - - f23e546c by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] update consolidation action - - - - - 3ee835e0 by Tony Chemit at 2024-01-18T10:23:34+01:00 [client] update runner tests - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/122d222c89b06b5b7c3a2c6c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/122d222c89b06b5b7c3a2c6c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update pom
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 01819545 by Tony Chemit at 2024-01-18T10:23:06+01:00 update pom - - - - - 1640c13a by Tony Chemit at 2024-01-18T10:23:06+01:00 [toolkit-maven-plugin] Add more actions in GenerateMigrationScriptRunner - - - - - d4cb0767 by Tony Chemit at 2024-01-18T10:23:06+01:00 [toolkit-persistence] Open MigrationVersionResourceExecutor.isPg method - - - - - 11 changed files: - client/datasource/editor/spi/pom.xml - pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java Changes: ===================================== client/datasource/editor/spi/pom.xml ===================================== @@ -154,6 +154,18 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>client-datasource-editor-spi</goalPrefix> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>reporting</id> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.59</version> + <version>2024.01</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java ===================================== @@ -261,7 +261,7 @@ public class MigrationVersionResourceExecutor implements AutoCloseable { return classLoader; } - protected boolean isPG() { + public boolean isPG() { return PGTopiaSqlDllSupportImpl.CLASSIFIER.equals(classifier); } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTask { + + private String schemaName; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java ===================================== @@ -0,0 +1,66 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTasks { + private String prefix; + private List<DropTableTask> tasks = List.of(); + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public List<DropTableTask> getTasks() { + return tasks; + } + + public void setTasks(List<DropTableTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + String addCascadeClause = h2 ? "" : " CASCADE"; + List<String> statements = new LinkedList<>(); + for (DropTableTask task : getTasks()) { + String schemaName = task.getSchemaName(); + for (String name : task.getTableName()) { + String tableName = name.toLowerCase(); + statements.add(String.format("DROP TABLE %s.%s%s;", schemaName, tableName, addCascadeClause)); + } + } + return statements; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since + */ +public class ExtractSchemaTask { + + private String schemaName; + private String prefix; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java ===================================== @@ -0,0 +1,60 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class ExtractTableTask { + + private String schemaName; + private String prefix; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java ===================================== @@ -96,14 +96,14 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { } PersistenceScriptHelper.write(scriptPath, context, String.format("empty-%%s-%s", scriptSuffix), "", true); - for (MigrationScriptTask.ExtractSchemaTask task : task.getSchemaTasks()) { + for (ExtractSchemaTask task : task.getSchemaTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); String baseName = String.format("%s_%%s-%s-%s", prefix, schemaName, scriptSuffix); ScriptSplitter.SplitSimpleResult filterOnSchema = ScriptSplitter.filterSchema(context, schemaName); PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-schema", false); } - for (MigrationScriptTask.ExtractTableTask task : task.getTableTasks()) { + for (ExtractTableTask task : task.getTableTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); for (String name : task.getTableName()) { @@ -113,6 +113,13 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-table", false); } } + for (DropTableTasks task : task.getDropTableTasks()) { + String baseName = String.format("%s_drop-tasks-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } + for (RenameForeignKeyTasks task : task.getRenameForeignKeyTasks()) { + String baseName = String.format("%s_rename-foreign-key-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } } - } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.toolkit.maven.plugin.persistence; */ import java.util.List; +import java.util.Objects; /** * Created on 24/11/2021. @@ -34,59 +35,8 @@ public class MigrationScriptTask { private List<ExtractSchemaTask> schemaTasks = List.of(); private List<ExtractTableTask> tableTasks = List.of(); - - public static class ExtractSchemaTask { - - private String schemaName; - private String prefix; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - } - - public static class ExtractTableTask { - - private String schemaName; - private String prefix; - private String[] tableName; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String[] getTableName() { - return tableName; - } - - public void setTableName(String[] tableName) { - this.tableName = tableName; - } - } + private List<DropTableTasks> dropTableTasks = List.of(); + private List<RenameForeignKeyTasks> renameForeignKeyTasks = List.of(); public List<ExtractSchemaTask> getSchemaTasks() { return schemaTasks; @@ -103,4 +53,20 @@ public class MigrationScriptTask { public void setTableTasks(List<ExtractTableTask> tableTasks) { this.tableTasks = tableTasks; } + + public List<DropTableTasks> getDropTableTasks() { + return dropTableTasks; + } + + public void setDropTableTasks(List<DropTableTasks> dropTableTasks) { + this.dropTableTasks = Objects.requireNonNull(dropTableTasks); + } + + public List<RenameForeignKeyTasks> getRenameForeignKeyTasks() { + return renameForeignKeyTasks; + } + + public void setRenameForeignKeyTasks(List<RenameForeignKeyTasks> renameForeignKeyTasks) { + this.renameForeignKeyTasks = renameForeignKeyTasks; + } } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java ===================================== @@ -0,0 +1,74 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTask { + private static final String RENAME_FOREIGN_KEY = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s');\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;"; + private static final String RENAME_FOREIGN_KEY_WITH_IDX = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s (and %3$s_idx → %4$s_idx)\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s_idx INTEGER;\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s'), %4$s_idx = %3$s_idx;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s_idx SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s_idx%5$s;"; + private final String schemaName; + private final String tableName; + private final boolean useIndex; + + public RenameForeignKeyTask(String schemaName, String tableName, boolean useIndex) { + this.schemaName = schemaName; + this.tableName = tableName; + this.useIndex = useIndex; + } + + public String getSchemaName() { + return schemaName; + } + + public String getTableName() { + return tableName; + } + + public boolean isUseIndex() { + return useIndex; + } + + public String toSql(boolean h2, String oldColumnName, String newColumnName) { + return String.format(isUseIndex() ? RENAME_FOREIGN_KEY_WITH_IDX : RENAME_FOREIGN_KEY, getSchemaName(), getTableName(), oldColumnName, newColumnName, h2 ? "" : " CASCADE"); + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTasks { + private final String prefix; + private final String oldColumnName; + private final String newColumnName; + private List<RenameForeignKeyTask> tasks = List.of(); + + public RenameForeignKeyTasks(String prefix, String oldColumnName, String newColumnName) { + this.prefix = prefix; + this.oldColumnName = oldColumnName; + this.newColumnName = newColumnName; + } + + public String getPrefix() { + return prefix; + } + + public String getOldColumnName() { + return oldColumnName; + } + + public String getNewColumnName() { + return newColumnName; + } + + public List<RenameForeignKeyTask> getTasks() { + return tasks; + } + + public void setTasks(List<RenameForeignKeyTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + List<String> statements = new LinkedList<>(); + for (RenameForeignKeyTask task : getTasks()) { + statements.add(task.toSql(h2, getOldColumnName(), getNewColumnName())); + } + return statements; + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/58e4b57332eb2d0c0e3516d5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/58e4b57332eb2d0c0e3516d5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update pom
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 86160984 by Tony Chemit at 2024-01-18T09:25:25+01:00 update pom - - - - - 5457da89 by Tony Chemit at 2024-01-18T09:25:27+01:00 [toolkit-maven-plugin] Add more actions in GenerateMigrationScriptRunner - - - - - 58e4b573 by Tony Chemit at 2024-01-18T09:25:30+01:00 [toolkit-persistence] Open MigrationVersionResourceExecutor.isPg method - - - - - 10 changed files: - pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.59</version> + <version>2024.01</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java ===================================== @@ -261,7 +261,7 @@ public class MigrationVersionResourceExecutor implements AutoCloseable { return classLoader; } - protected boolean isPG() { + public boolean isPG() { return PGTopiaSqlDllSupportImpl.CLASSIFIER.equals(classifier); } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTask { + + private String schemaName; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java ===================================== @@ -0,0 +1,66 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTasks { + private String prefix; + private List<DropTableTask> tasks = List.of(); + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public List<DropTableTask> getTasks() { + return tasks; + } + + public void setTasks(List<DropTableTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + String addCascadeClause = h2 ? "" : " CASCADE"; + List<String> statements = new LinkedList<>(); + for (DropTableTask task : getTasks()) { + String schemaName = task.getSchemaName(); + for (String name : task.getTableName()) { + String tableName = name.toLowerCase(); + statements.add(String.format("DROP TABLE %s.%s%s;", schemaName, tableName, addCascadeClause)); + } + } + return statements; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since + */ +public class ExtractSchemaTask { + + private String schemaName; + private String prefix; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java ===================================== @@ -0,0 +1,60 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class ExtractTableTask { + + private String schemaName; + private String prefix; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java ===================================== @@ -96,14 +96,14 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { } PersistenceScriptHelper.write(scriptPath, context, String.format("empty-%%s-%s", scriptSuffix), "", true); - for (MigrationScriptTask.ExtractSchemaTask task : task.getSchemaTasks()) { + for (ExtractSchemaTask task : task.getSchemaTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); String baseName = String.format("%s_%%s-%s-%s", prefix, schemaName, scriptSuffix); ScriptSplitter.SplitSimpleResult filterOnSchema = ScriptSplitter.filterSchema(context, schemaName); PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-schema", false); } - for (MigrationScriptTask.ExtractTableTask task : task.getTableTasks()) { + for (ExtractTableTask task : task.getTableTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); for (String name : task.getTableName()) { @@ -113,6 +113,13 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-table", false); } } + for (DropTableTasks task : task.getDropTableTasks()) { + String baseName = String.format("%s_drop-tasks-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } + for (RenameForeignKeyTasks task : task.getRenameForeignKeyTasks()) { + String baseName = String.format("%s_rename-foreign-key-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } } - } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.toolkit.maven.plugin.persistence; */ import java.util.List; +import java.util.Objects; /** * Created on 24/11/2021. @@ -34,59 +35,8 @@ public class MigrationScriptTask { private List<ExtractSchemaTask> schemaTasks = List.of(); private List<ExtractTableTask> tableTasks = List.of(); - - public static class ExtractSchemaTask { - - private String schemaName; - private String prefix; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - } - - public static class ExtractTableTask { - - private String schemaName; - private String prefix; - private String[] tableName; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String[] getTableName() { - return tableName; - } - - public void setTableName(String[] tableName) { - this.tableName = tableName; - } - } + private List<DropTableTasks> dropTableTasks = List.of(); + private List<RenameForeignKeyTasks> renameForeignKeyTasks = List.of(); public List<ExtractSchemaTask> getSchemaTasks() { return schemaTasks; @@ -103,4 +53,20 @@ public class MigrationScriptTask { public void setTableTasks(List<ExtractTableTask> tableTasks) { this.tableTasks = tableTasks; } + + public List<DropTableTasks> getDropTableTasks() { + return dropTableTasks; + } + + public void setDropTableTasks(List<DropTableTasks> dropTableTasks) { + this.dropTableTasks = Objects.requireNonNull(dropTableTasks); + } + + public List<RenameForeignKeyTasks> getRenameForeignKeyTasks() { + return renameForeignKeyTasks; + } + + public void setRenameForeignKeyTasks(List<RenameForeignKeyTasks> renameForeignKeyTasks) { + this.renameForeignKeyTasks = renameForeignKeyTasks; + } } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java ===================================== @@ -0,0 +1,74 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTask { + private static final String RENAME_FOREIGN_KEY = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s');\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;"; + private static final String RENAME_FOREIGN_KEY_WITH_IDX = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s (and %3$s_idx → %4$s_idx)\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s_idx INTEGER;\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s'), %4$s_idx = %3$s_idx;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s_idx SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s_idx%5$s;"; + private final String schemaName; + private final String tableName; + private final boolean useIndex; + + public RenameForeignKeyTask(String schemaName, String tableName, boolean useIndex) { + this.schemaName = schemaName; + this.tableName = tableName; + this.useIndex = useIndex; + } + + public String getSchemaName() { + return schemaName; + } + + public String getTableName() { + return tableName; + } + + public boolean isUseIndex() { + return useIndex; + } + + public String toSql(boolean h2, String oldColumnName, String newColumnName) { + return String.format(isUseIndex() ? RENAME_FOREIGN_KEY_WITH_IDX : RENAME_FOREIGN_KEY, getSchemaName(), getTableName(), oldColumnName, newColumnName, h2 ? "" : " CASCADE"); + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTasks { + private final String prefix; + private final String oldColumnName; + private final String newColumnName; + private List<RenameForeignKeyTask> tasks = List.of(); + + public RenameForeignKeyTasks(String prefix, String oldColumnName, String newColumnName) { + this.prefix = prefix; + this.oldColumnName = oldColumnName; + this.newColumnName = newColumnName; + } + + public String getPrefix() { + return prefix; + } + + public String getOldColumnName() { + return oldColumnName; + } + + public String getNewColumnName() { + return newColumnName; + } + + public List<RenameForeignKeyTask> getTasks() { + return tasks; + } + + public void setTasks(List<RenameForeignKeyTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + List<String> statements = new LinkedList<>(); + for (RenameForeignKeyTask task : getTasks()) { + statements.add(task.toSql(h2, getOldColumnName(), getNewColumnName())); + } + return statements; + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d0f871141f2b167a16a96b8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d0f871141f2b167a16a96b8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2829] 33 commits: update pom
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch feature/issue-2829 at ultreiaio / ird-observe Commits: 86160984 by Tony Chemit at 2024-01-18T09:25:25+01:00 update pom - - - - - 5457da89 by Tony Chemit at 2024-01-18T09:25:27+01:00 [toolkit-maven-plugin] Add more actions in GenerateMigrationScriptRunner - - - - - 58e4b573 by Tony Chemit at 2024-01-18T09:25:30+01:00 [toolkit-persistence] Open MigrationVersionResourceExecutor.isPg method - - - - - d69c134a by Tony Chemit at 2024-01-18T09:25:52+01:00 [model] Rename Set to FishingSet - - - - - 58bee05b by Tony Chemit at 2024-01-18T09:25:52+01:00 [model] Update fixtures - - - - - 6a688e62 by Tony Chemit at 2024-01-18T09:25:52+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - fc66246b by Tony Chemit at 2024-01-18T09:25:52+01:00 [core-api] Update dto - - - - - 9f176d33 by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-api] Update decorators - - - - - 1405c42a by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-api] Update validators - - - - - c5aed3e9 by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-api] Update tree mapping - - - - - 94049732 by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-api] Update validation - - - - - 814d8960 by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-api] Update services - - - - - a3a6f687 by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-persistence] Update entities - - - - - 69100edb by Tony Chemit at 2024-01-18T09:25:53+01:00 [core-persistence] Update decorators - - - - - 73d18cf3 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-persistence] Add migration - - - - - e3313aed by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-persistence] Update report definitions - - - - - 82316449 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-persistence] Update consolidation conde - - - - - 0bff74be by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-persistence] Update resources - - - - - de337860 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-persistence] Update tests - - - - - 509a76d3 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-services] Update i18n - - - - - ec396ac7 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-services] Update TripServiceLocal - - - - - f07ba802 by Tony Chemit at 2024-01-18T09:33:17+01:00 [core-services] Update tests fixtures - - - - - c34e0e80 by Tony Chemit at 2024-01-18T09:33:17+01:00 [server] Update mapping - - - - - 0fab01b7 by Tony Chemit at 2024-01-18T09:33:17+01:00 [server] Update public API documentation - - - - - 16c9e8f9 by Tony Chemit at 2024-01-18T09:33:17+01:00 [client] Update default swing Preferences - - - - - c0efb4db by Tony Chemit at 2024-01-18T09:33:17+01:00 [client] Update data source editor SPI - - - - - ecb89de7 by Tony Chemit at 2024-01-18T09:33:17+01:00 [client] Update ps module - - - - - bfbf4ae6 by Tony Chemit at 2024-01-18T09:33:17+01:00 [client] Update ll module - - - - - e22033a4 by Tony Chemit at 2024-01-18T09:33:18+01:00 [client] clean DataSourceEditor.jaxx file - - - - - 185fda8b by Tony Chemit at 2024-01-18T09:33:18+01:00 [client] update pg scripts - - - - - 560856dd by Tony Chemit at 2024-01-18T09:33:18+01:00 [client] update i18n - - - - - 68572418 by Tony Chemit at 2024-01-18T09:33:18+01:00 [client] update consolidation action - - - - - 122d222c by Tony Chemit at 2024-01-18T09:33:18+01:00 [client] update runner tests - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/90627231c5f4aa60dfb19edd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/90627231c5f4aa60dfb19edd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2829
by Tony CHEMIT (＠tchemit) Jan. 12, 2024

Jan. 12, 2024

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Happy new year commit \o/ :D
by Tony CHEMIT (＠tchemit) Jan. 11, 2024

Jan. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d53a9d31 by Tony Chemit at 2024-01-11T16:00:59+01:00 Happy new year commit \o/ :D - - - - - e298cd79 by Tony Chemit at 2024-01-11T16:01:22+01:00 [toolkit-persistence] Fix filterTable (got too much indexes) - - - - - d0f87114 by Tony Chemit at 2024-01-11T16:01:27+01:00 [services-test] Update validation fixture - See #2044 - - - - - 30 changed files: - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/GPSPointDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripDtoWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripReferenceWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingPartDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingPartReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDtoWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReferenceWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivitySampleReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/HooksCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/SampleDtoDecoratorDefinition.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8d8c410bc63f59cc57d7a0c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8d8c410bc63f59cc57d7a0c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: [persistence] introduce SqlQueryDefinition API (to store any sql query for an entity)
by Tony CHEMIT (＠tchemit) Jan. 9, 2024

Jan. 9, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 12b0604d by Tony Chemit at 2024-01-09T14:28:00+01:00 [persistence] introduce SqlQueryDefinition API (to store any sql query for an entity) - - - - - b3db65f3 by Tony Chemit at 2024-01-09T14:28:00+01:00 [persistence] improve QuerySupport to be able to manage NativeQuery in a simple way - - - - - 5d91efd5 by Tony Chemit at 2024-01-09T14:28:00+01:00 [persistence - template] generate sql queries in hibernate mapping from user sql queries files - - - - - 6fe109fd by Tony Chemit at 2024-01-09T14:28:00+01:00 [persistence - template] generate in dao methods to wrap user sql queries - - - - - ee5b124c by Tony Chemit at 2024-01-09T14:28:00+01:00 [persistence - model] defines ObServe sql queries (extracted from dao and spi code) - - - - - c9b1a8cf by Tony Chemit at 2024-01-09T14:28:01+01:00 [persistence - dao] use now generated code (no sql in java code) - - - - - 34ac5632 by Tony Chemit at 2024-01-09T14:28:01+01:00 [persistence - test] test all dao user sql queries - - - - - 5536c73a by Tony Chemit at 2024-01-09T14:28:01+01:00 [persistence - spi] use new dao methods - - - - - 5c38e81d by Tony Chemit at 2024-01-09T14:28:01+01:00 [service] use new spi methods - - - - - b5d9e06b by Tony Chemit at 2024-01-09T14:28:01+01:00 [service - test] adapt test - - - - - 8d8c410b by Tony Chemit at 2024-01-09T14:30:53+01:00 Merge branch 'feature/issue-2827' into develop Extraire toutes les requêtes sql (et les ajouter au niveau du modèle) - Closes #2827 - - - - - 30 changed files: - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - − core/persistence/java/src/main/java/fr/ird/observe/entities/data/TripMapQuerySupport.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripMapBuilder.java → core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java → core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteTopiaDao.java - core/persistence/java/src/main/resources/fr/ird/observe/entities/LastUpdateDateImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesMeasurementImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e58a50859e48ac237e4fc7f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e58a50859e48ac237e4fc7f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout d'une option avancée pour ne pas consolider les données sur un assistant...
by Tony CHEMIT (＠tchemit) Jan. 9, 2024

Jan. 9, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da987f1e by Tony Chemit at 2024-01-09T14:26:17+01:00 Ajout d'une option avancée pour ne pas consolider les données sur un assistant de reporting - Closes #2828 - - - - - e58a5085 by Tony Chemit at 2024-01-09T14:26:18+01:00 improve report parser - - - - - 3 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java ===================================== @@ -88,7 +88,6 @@ public class ConsolidateModel extends AdminActionModel { setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound()); setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound()); - uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java ===================================== @@ -227,6 +227,7 @@ public class ReportModel extends AdminActionModel { }; selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport); updateReports(); + uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java ===================================== @@ -58,32 +58,32 @@ import java.util.stream.Collectors; */ public abstract class ReportDefinitionsBuilderPropertiesSupport implements ReportDefinitionsBuilder { protected static final String VARIABLE_PREFIX = "variable."; - protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\w+).name"); + protected static final Pattern VARIABLE_NAME_PATTERN = Pattern.compile("variable.(\\d+).name"); protected static final String VARIABLE_TYPE_FORMAT = "variable.%s.type"; protected static final String VARIABLE_REQUEST_FORMAT = "variable.%s.request"; protected static final String VARIABLE_COMMENT_FORMAT = "variable.%s.comment"; protected static final String REPEAT_VARIABLE_PREFIX = "repeatVariable."; - protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\w+).name"); + protected static final Pattern REPEAT_VARIABLE_NAME_PATTERN = Pattern.compile("repeatVariable.(\\d+).name"); protected static final String REPEAT_VARIABLE_TYPE_FORMAT = "repeatVariable.%s.type"; protected static final String REPEAT_VARIABLE_REQUEST_FORMAT = "repeatVariable.%s.request"; protected static final String REPEAT_VARIABLE_ADD_NULL_FORMAT = "repeatVariable.%s.addNull"; protected static final String REPEAT_VARIABLE_COMMENT_FORMAT = "repeatVariable.%s.comment"; protected static final String REQUEST_PREFIX = "request."; - protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\w+).location"); + protected static final Pattern REQUEST_LOCATION_PATTERN = Pattern.compile("request.(\\d+).location"); protected static final String REQUEST_LAYOUT_FORMAT = "request.%s.layout"; protected static final String REQUEST_REQUEST_FORMAT = "request.%s.request"; protected static final String REQUEST_COMMENT_FORMAT = "request.%s.comment"; protected static final String REQUEST_REPEAT_NAME_FORMAT = "request.%s.repeat.name"; protected static final String REQUEST_REPEAT_LAYOUT_FORMAT = "request.%s.repeat.layout"; protected static final String OPERATION_PREFIX = "operations."; - protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\w+).type"); + protected static final Pattern OPERATION_TYPE_PATTERN = Pattern.compile("operations.(\\d+).type"); protected static final String OPERATION_PARAMETERS_FORMAT = "operations.%s.parameters"; protected static final String I18n_PREFIX = "i18n."; protected static final Pattern I18N_PATTERN = Pattern.compile("i18n\\.([^.]+)"); protected static final String I18N_LABEL_EN_FORMAT = "i18n.%s.en"; protected static final String I18N_LABEL_ES_FORMAT = "i18n.%s.es"; protected static final String COLUMN_RENDERER_PREFIX = "columnRenderers."; - protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\w+).type"); + protected static final Pattern COLUMN_RENDERER_TYPE_PATTERN = Pattern.compile("columnRenderers.(\\d+).type"); protected static final String COLUMN_RENDERER_PARAMETERS_FORMAT = "columnRenderers.%s.parameters"; protected static final String REPORT_MODEL_TYPE = "modelType"; protected static final String REPORT_NAME = "name"; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1124039e15d227d77959476a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1124039e15d227d77959476a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: [persistence] introduce SqlQueryDefinition API (to store any sql query for an entity)
by Tony CHEMIT (＠tchemit) Jan. 9, 2024

Jan. 9, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 81203499 by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence] introduce SqlQueryDefinition API (to store any sql query for an entity) - - - - - 0d2219f1 by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence] improve QuerySupport to be able to manage NativeQuery in a simple way - - - - - a66463ac by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - template] generate sql queries in hibernate mapping from user sql queries files - - - - - 45d170b2 by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - template] generate in dao methods to wrap user sql queries - - - - - ebe9406d by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - model] defines ObServe sql queries (extracted from dao and spi code) - - - - - 2219d8cf by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - dao] use now generated code (no sql in java code) - - - - - 3bab4e76 by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - test] test all dao user sql queries - - - - - 3d39c474 by Tony Chemit at 2024-01-09T13:34:59+01:00 [persistence - spi] use new dao methods - - - - - ea728265 by Tony Chemit at 2024-01-09T13:34:59+01:00 [service] use new spi methods - - - - - 0b1e214e by Tony Chemit at 2024-01-09T13:34:59+01:00 [service - test] adapt test - - - - - 1124039e by Tony Chemit at 2024-01-09T13:36:44+01:00 Merge branch 'feature/issue-sql-queries' into develop Extraire toutes les requêtes sql (et les ajouter au niveau du modèle) - Closes #2827 - - - - - 30 changed files: - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - − core/persistence/java/src/main/java/fr/ird/observe/entities/data/TripMapQuerySupport.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripMapBuilder.java → core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java → core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteTopiaDao.java - core/persistence/java/src/main/resources/fr/ird/observe/entities/LastUpdateDateImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesMeasurementImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27371fe3b5d5378db150b6d9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27371fe3b5d5378db150b6d9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-sql-queries
by Tony CHEMIT (＠tchemit) Jan. 9, 2024

Jan. 9, 2024

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

1 0