From b2dcc19f5d509a60dc56f9204069c013ab8b93d5 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Thu, 20 Mar 2025 13:43:56 +0200 Subject: [PATCH] [#2191] Remove DB2 and MS SQL support (#2321) Signed-off-by: Avgustin Marinov --- README.md | 15 +- hawkbit-ddi/hawkbit-ddi-server/pom.xml | 8 - .../main/resources/application-db2.properties | 19 - .../resources/application-mssql.properties | 19 - hawkbit-dmf/hawkbit-dmf-server/pom.xml | 8 - .../main/resources/application-db2.properties | 19 - .../resources/application-mssql.properties | 19 - hawkbit-mgmt/hawkbit-mgmt-server/pom.xml | 8 - .../main/resources/application-db2.properties | 19 - .../resources/application-mssql.properties | 19 - .../hawkbit-update-server/pom.xml | 8 - .../application-cloudsandbox.properties | 46 -- .../main/resources/application-db2.properties | 19 - .../resources/application-mssql.properties | 19 - ..._length_of_target_attributes_key___DB2.sql | 1 - ..._11__add_auto_assign_action_type___DB2.sql | 1 - ...length_of_controller_id_and_name___DB2.sql | 13 - ...V1_12_13__add_action_external_id___DB2.sql | 4 - .../DB2/V1_12_14__add_sha256_hash___DB2.sql | 1 - .../DB2/V1_12_15__add_weight___DB2.sql | 3 - ...1_12_16__add_action_initiated_by___DB2.sql | 3 - ...12_17__add_index_target_modified___DB2.sql | 1 - .../DB2/V1_12_18__add_target_type___DB2.sql | 32 -- .../V1_12_19__add_valid_flag_to_ds___DB2.sql | 3 - ...12_20__add_encryption_flag_to_sm___DB2.sql | 3 - ...12_21__add_rollouts_status_index___DB2.sql | 1 - ...__change_target_type_name_length___DB2.sql | 1 - ...V1_12_23__add_action_status_code___DB2.sql | 2 - ..._24__add_last_action_status_code___DB2.sql | 1 - .../V1_12_25__add_confirmation_flag___DB2.sql | 22 - ...2_26__add_access_control_context___DB2.sql | 2 - ..._12_27__target_type_inherit_type___DB2.sql | 3 - .../V1_12_28__add_dynamic_rollout___DB2.sql | 9 - .../DB2/V1_12_29__add_ds_sm_locked___DB2.sql | 2 - .../migration/DB2/V1_12_5__baseline___DB2.sql | 458 ------------------ .../DB2/V1_12_6__add_index___DB2.sql | 2 - ...2_7__add_rollout_approval_fields___DB2.sql | 2 - ...ngth_of_created_last_modified_by___DB2.sql | 45 -- .../V1_12_9__add_target_metadata___DB2.sql | 9 - ..._of_target_attributes_key___SQL_SERVER.sql | 1 - ...d_auto_assign_action_type___SQL_SERVER.sql | 1 - ...of_controller_id_and_name___SQL_SERVER.sql | 13 - ...3__add_action_external_id___SQL_SERVER.sql | 4 - ...V1_12_14__add_sha256_hash___SQL_SERVER.sql | 1 - .../V1_12_15__add_weight___SQL_SERVER.sql | 3 - ...__add_action_initiated_by___SQL_SERVER.sql | 3 - ...add_index_target_modified___SQL_SERVER.sql | 1 - ...V1_12_18__add_target_type___SQL_SERVER.sql | 27 -- ..._19__add_valid_flag_to_ds___SQL_SERVER.sql | 1 - ...add_encryption_flag_to_sm___SQL_SERVER.sql | 1 - ...add_rollouts_status_index___SQL_SERVER.sql | 1 - ..._22__fix_target_type_name___SQL_SERVER.sql | 1 - ...3__add_action_status_code___SQL_SERVER.sql | 2 - ...d_last_action_status_code___SQL_SERVER.sql | 1 - ...25__add_confirmation_flag___SQL_SERVER.sql | 19 - ...dd_access_control_context___SQL_SERVER.sql | 2 - ..._target_type_inherit_type___SQL_SERVER.sql | 3 - ...2_28__add_dynamic_rollout___SQL_SERVER.sql | 9 - ...1_12_29__add_ds_sm_locked___SQL_SERVER.sql | 2 - .../V1_12_5__baseline___SQL_SERVER.sql | 383 --------------- .../V1_12_6__add_index___SQL_SERVER.sql | 2 - ...d_rollout_approval_fields___SQL_SERVER.sql | 2 - ..._created_last_modified_by___SQL_SERVER.sql | 45 -- ...12_9__add_target_metadata___SQL_SERVER.sql | 9 - .../repository/jpa/rsql/RSQLUtilityTest.java | 6 +- .../hawkbit-repository-test/pom.xml | 8 - .../test/util/MsSqlTestDatabase.java | 53 -- .../util/SharedSqlTestDatabaseExtension.java | 3 - 68 files changed, 11 insertions(+), 1465 deletions(-) delete mode 100644 hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-db2.properties delete mode 100644 hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-mssql.properties delete mode 100644 hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties delete mode 100644 hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties delete mode 100644 hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-db2.properties delete mode 100644 hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-mssql.properties delete mode 100644 hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties delete mode 100644 hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties delete mode 100644 hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_10__change_length_of_target_attributes_key___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_11__add_auto_assign_action_type___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_12__change_length_of_controller_id_and_name___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_13__add_action_external_id___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_14__add_sha256_hash___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_15__add_weight___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_17__add_index_target_modified___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_18__add_target_type___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_19__add_valid_flag_to_ds___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_20__add_encryption_flag_to_sm___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_21__add_rollouts_status_index___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_22__change_target_type_name_length___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_23__add_action_status_code___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_24__add_last_action_status_code___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_25__add_confirmation_flag___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_26__add_access_control_context___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_27__target_type_inherit_type___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_28__add_dynamic_rollout___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_29__add_ds_sm_locked___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_5__baseline___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_6__add_index___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_9__add_target_metadata___DB2.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_10__change_length_of_target_attributes_key___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_11__add_auto_assign_action_type___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_12__change_length_of_controller_id_and_name___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_13__add_action_external_id___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_14__add_sha256_hash___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_15__add_weight___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_17__add_index_target_modified___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_18__add_target_type___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_19__add_valid_flag_to_ds___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_20__add_encryption_flag_to_sm___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_21__add_rollouts_status_index___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_22__fix_target_type_name___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_23__add_action_status_code___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_24__add_last_action_status_code___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_25__add_confirmation_flag___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_26__add_access_control_context___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_27__target_type_inherit_type___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_28__add_dynamic_rollout___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_29__add_ds_sm_locked___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_5__baseline___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_6__add_index___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_9__add_target_metadata___SQL_SERVER.sql delete mode 100644 hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MsSqlTestDatabase.java diff --git a/README.md b/README.md index 0b7054911..d46eca5eb 100644 --- a/README.md +++ b/README.md @@ -93,14 +93,13 @@ There are clients outside of the Eclipse IoT eco system as well, e.g.: ## SQL database -| Database | H2 | MySQL/MariaDB | MS SQL Server | PostgreSQL | IBM DB2 | -|-----------------------------------|:------------------------------------------------------:|:---------------------------------------------------------------------------:|:-----------------------------------------------------------------:|:-----------------------------------------------------------------:|:------------------:| -| DDLs maintained by project | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | -| Test dependencies defined | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | -| Versions tested | 2.1 | MySQL 8.0.23, AWS Aurora | MS SQL Server 2017/2019 | PostgreSQL 12/13 | DB2 Server v11.1 | -| Docker image with driver provided | :white_check_mark: | :white_check_mark: (Tag: "-mysql") | :white_check_mark: | :white_check_mark: | | -| JDBC driver | [H2 2.1.214](https://github.com/h2database/h2database) | [MariaDB Connector/J 2.7.8](https://github.com/MariaDB/mariadb-connector-j) | [MSSQL-JDBC 10.2.3.jre8](https://github.com/Microsoft/mssql-jdbc) | [PostgreSQL JDBC Driver 42.3.8](https://github.com/pgjdbc/pgjdbc) | | -| Status | Test, Dev | Production grade | Production grade | Test, Dev | Test, Dev | +| Database | H2 | MySQL/MariaDB | PostgreSQL | +|-----------------------------------|:----------------------------------------------:|:---------------------------------------------------------------------:|:--------------------------------------------------------:| +| DDLs maintained by project | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Test dependencies defined | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Docker image with driver provided | :white_check_mark: | :white_check_mark: (Tag: "-mysql") | :white_check_mark: | +| JDBC driver | [H2](https://github.com/h2database/h2database) | [MariaDB Connector/J](https://github.com/MariaDB/mariadb-connector-j) |[PostgreSQL JDBC Driver](https://github.com/pgjdbc/pgjdbc)| +| Status | Test, Dev | Production grade | Test, Dev | ## (Optional) RabbitMQ: 3.6,3.7,3.8 diff --git a/hawkbit-ddi/hawkbit-ddi-server/pom.xml b/hawkbit-ddi/hawkbit-ddi-server/pom.xml index 6351c2a0b..c1659dc92 100644 --- a/hawkbit-ddi/hawkbit-ddi-server/pom.xml +++ b/hawkbit-ddi/hawkbit-ddi-server/pom.xml @@ -50,20 +50,12 @@ org.mariadb.jdbc mariadb-java-client - - com.microsoft.sqlserver - mssql-jdbc - org.flywaydb flyway-database-postgresql - - org.flywaydb - flyway-sqlserver - org.flywaydb flyway-mysql diff --git a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-db2.properties b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-db2.properties deleted file mode 100644 index 16a0fa0b8..000000000 --- a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-db2.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2019 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a DB2 DB usage. -# Keep in mind that you need the DB2 driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=DB2 -spring.datasource.url=jdbc:db2://localhost:50000/hawkbit -spring.datasource.username=db2inst1 -spring.datasource.password=db2inst1-pwd -spring.datasource.driverClassName=com.ibm.db2.jcc.DB2Driver diff --git a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-mssql.properties b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-mssql.properties deleted file mode 100644 index a00c95aa8..000000000 --- a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application-mssql.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a Microsoft SQL Server DB usage. -# Keep in mind that you need the SQL server driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=SQL_SERVER -spring.datasource.url=jdbc:sqlserver://localhost:1433;database=hawkbit -spring.datasource.username=SA -spring.datasource.password= -spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/hawkbit-dmf/hawkbit-dmf-server/pom.xml b/hawkbit-dmf/hawkbit-dmf-server/pom.xml index 9fd866453..9c40332e5 100644 --- a/hawkbit-dmf/hawkbit-dmf-server/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-server/pom.xml @@ -50,20 +50,12 @@ org.mariadb.jdbc mariadb-java-client - - com.microsoft.sqlserver - mssql-jdbc - org.flywaydb flyway-database-postgresql - - org.flywaydb - flyway-sqlserver - org.flywaydb flyway-mysql diff --git a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties deleted file mode 100644 index 16a0fa0b8..000000000 --- a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2019 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a DB2 DB usage. -# Keep in mind that you need the DB2 driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=DB2 -spring.datasource.url=jdbc:db2://localhost:50000/hawkbit -spring.datasource.username=db2inst1 -spring.datasource.password=db2inst1-pwd -spring.datasource.driverClassName=com.ibm.db2.jcc.DB2Driver diff --git a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties deleted file mode 100644 index a00c95aa8..000000000 --- a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a Microsoft SQL Server DB usage. -# Keep in mind that you need the SQL server driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=SQL_SERVER -spring.datasource.url=jdbc:sqlserver://localhost:1433;database=hawkbit -spring.datasource.username=SA -spring.datasource.password= -spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml b/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml index 5c212be51..f4058e20e 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml +++ b/hawkbit-mgmt/hawkbit-mgmt-server/pom.xml @@ -50,20 +50,12 @@ org.mariadb.jdbc mariadb-java-client - - com.microsoft.sqlserver - mssql-jdbc - org.flywaydb flyway-database-postgresql - - org.flywaydb - flyway-sqlserver - org.flywaydb flyway-mysql diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-db2.properties b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-db2.properties deleted file mode 100644 index 16a0fa0b8..000000000 --- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-db2.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2019 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a DB2 DB usage. -# Keep in mind that you need the DB2 driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=DB2 -spring.datasource.url=jdbc:db2://localhost:50000/hawkbit -spring.datasource.username=db2inst1 -spring.datasource.password=db2inst1-pwd -spring.datasource.driverClassName=com.ibm.db2.jcc.DB2Driver diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-mssql.properties b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-mssql.properties deleted file mode 100644 index a00c95aa8..000000000 --- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application-mssql.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a Microsoft SQL Server DB usage. -# Keep in mind that you need the SQL server driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=SQL_SERVER -spring.datasource.url=jdbc:sqlserver://localhost:1433;database=hawkbit -spring.datasource.username=SA -spring.datasource.password= -spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/hawkbit-monolith/hawkbit-update-server/pom.xml b/hawkbit-monolith/hawkbit-update-server/pom.xml index a727e4755..c042c9edb 100644 --- a/hawkbit-monolith/hawkbit-update-server/pom.xml +++ b/hawkbit-monolith/hawkbit-update-server/pom.xml @@ -45,20 +45,12 @@ org.mariadb.jdbc mariadb-java-client - - com.microsoft.sqlserver - mssql-jdbc - org.flywaydb flyway-database-postgresql - - org.flywaydb - flyway-sqlserver - org.flywaydb flyway-mysql diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties deleted file mode 100644 index f47d51f6d..000000000 --- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -server.forward-headers-strategy=NATIVE - -# Sandbox, small files only -spring.servlet.multipart.max-file-size=100KB -spring.servlet.multipart.max-request-size=-1 - -## Configuration for building download URLs - START -hawkbit.artifact.url.protocols.download-http.rel=download-http -hawkbit.artifact.url.protocols.download-http.protocol=https -hawkbit.artifact.url.protocols.download-http.supports=DMF,DDI -hawkbit.artifact.url.protocols.download-http.hostname=hawkbit.eclipseprojects.io -hawkbit.artifact.url.protocols.download-http.ref={protocol}://{hostname}/{tenant}/controller/v1/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} -hawkbit.artifact.url.protocols.download-cdn-http.rel=download -hawkbit.artifact.url.protocols.download-cdn-http.protocol=https -hawkbit.artifact.url.protocols.download-cdn-http.supports=MGMT -hawkbit.artifact.url.protocols.download-cdn-http.hostname=hawkbit.eclipseprojects.io -hawkbit.artifact.url.protocols.download-cdn-http.ref={protocol}://{hostnameRequest}:{portRequest}/rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} -hawkbit.artifact.url.protocols.md5sum-http.rel=md5sum-http -hawkbit.artifact.url.protocols.md5sum-http.protocol=${hawkbit.artifact.url.protocols.download-http.protocol} -hawkbit.artifact.url.protocols.md5sum-http.supports=DDI -hawkbit.artifact.url.protocols.md5sum-http.hostname=${hawkbit.artifact.url.protocols.download-http.hostname} -hawkbit.artifact.url.protocols.md5sum-http.ref=${hawkbit.artifact.url.protocols.download-http.ref}.MD5SUM -## Configuration for building download URLs - END - -spring.security.user.name=demo -spring.security.user.password={noop}demo -hawkbit.server.security.require-ssl=true - -hawkbit.server.ui.demo.user=${spring.security.user.name} -hawkbit.server.ui.demo.password=${spring.security.user.name} -hawkbit.server.ui.demo.disclaimer=By signing in, you consent that we store the following data for up to one week: \ -
  • IP-Address: Your client's IP-Address, as well as, the IP-Address of any device you connect to the \ - application are stored for the purpose of misuse prevention.
\ -

You are not permitted to store any kind of personal data in this application, since this is a shared account. \ - Furthermore, this sandbox is reset once a week deleting all data.

\ -

Credentials: ${hawkbit.server.ui.demo.user}:${hawkbit.server.ui.demo.password}

 diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties deleted file mode 100644 index 16a0fa0b8..000000000 --- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2019 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a DB2 DB usage. -# Keep in mind that you need the DB2 driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=DB2 -spring.datasource.url=jdbc:db2://localhost:50000/hawkbit -spring.datasource.username=db2inst1 -spring.datasource.password=db2inst1-pwd -spring.datasource.driverClassName=com.ibm.db2.jcc.DB2Driver diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties deleted file mode 100644 index a00c95aa8..000000000 --- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# This profile adds basic configurations for a Microsoft SQL Server DB usage. -# Keep in mind that you need the SQL server driver in your classpath on compile. -# see https://www.eclipse.org/hawkbit/guides/runhawkbit/ - -spring.jpa.database=SQL_SERVER -spring.datasource.url=jdbc:sqlserver://localhost:1433;database=hawkbit -spring.datasource.username=SA -spring.datasource.password= -spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_10__change_length_of_target_attributes_key___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_10__change_length_of_target_attributes_key___DB2.sql deleted file mode 100644 index cdcffc506..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_10__change_length_of_target_attributes_key___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_attributes ALTER COLUMN attribute_key SET DATA TYPE VARCHAR(128); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_11__add_auto_assign_action_type___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_11__add_auto_assign_action_type___DB2.sql deleted file mode 100644 index 9c6b67bf3..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_11__add_auto_assign_action_type___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_filter_query ADD COLUMN auto_assign_action_type INTEGER; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_12__change_length_of_controller_id_and_name___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_12__change_length_of_controller_id_and_name___DB2.sql deleted file mode 100644 index fc5d4f0f0..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_12__change_length_of_controller_id_and_name___DB2.sql +++ /dev/null @@ -1,13 +0,0 @@ -ALTER TABLE sp_distribution_set ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_distribution_set_type ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_distributionset_tag ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_base_software_module ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_rollout ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_rolloutgroup ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_software_module_type ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_target ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_target_filter_query ALTER COLUMN name SET DATA TYPE VARCHAR(128); -ALTER TABLE sp_target_tag ALTER COLUMN name SET DATA TYPE VARCHAR(128); - - -ALTER TABLE sp_target ALTER COLUMN controller_id SET DATA TYPE VARCHAR(256); diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_13__add_action_external_id___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_13__add_action_external_id___DB2.sql deleted file mode 100644 index 8dbda293f..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_13__add_action_external_id___DB2.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE sp_action ADD COLUMN external_ref VARCHAR(512); -CREATE INDEX sp_idx_action_external_ref ON sp_action (external_ref); - - \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_14__add_sha256_hash___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_14__add_sha256_hash___DB2.sql deleted file mode 100644 index ca7e53fce..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_14__add_sha256_hash___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_artifact ADD COLUMN sha256_hash CHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_15__add_weight___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_15__add_weight___DB2.sql deleted file mode 100644 index 9eaad20e1..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_15__add_weight___DB2.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_action ADD weight INT; -ALTER TABLE sp_rollout ADD weight INT; -ALTER TABLE sp_target_filter_query ADD auto_assign_weight INT; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql deleted file mode 100644 index 6d00f9f50..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_action ADD COLUMN initiated_by VARCHAR(64) NOT NULL DEFAULT ''; -ALTER TABLE sp_action ALTER COLUMN initiated_by DROP DEFAULT; -ALTER TABLE sp_target_filter_query ADD COLUMN auto_assign_initiated_by VARCHAR(64); diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_17__add_index_target_modified___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_17__add_index_target_modified___DB2.sql deleted file mode 100644 index ac70ee7f0..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_17__add_index_target_modified___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX sp_idx_target_05 ON sp_target (tenant, last_modified_at); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_18__add_target_type___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_18__add_target_type___DB2.sql deleted file mode 100644 index fed3796ff..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_18__add_target_type___DB2.sql +++ /dev/null @@ -1,32 +0,0 @@ -CREATE TABLE sp_target_type -( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16), - created_at BIGINT NOT NULL, - created_by VARCHAR(64) NOT NULL, - description VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(64) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - PRIMARY KEY (id) -); - -CREATE INDEX sp_idx_target_type_prim - ON sp_target_type (tenant, id); - -CREATE TABLE sp_target_type_ds_type_relation -( - target_type BIGINT NOT NULL, - distribution_set_type BIGINT NOT NULL, - PRIMARY KEY (target_type, distribution_set_type) -); - -ALTER TABLE sp_target_type ADD CONSTRAINT uk_target_type_name UNIQUE (name, tenant); - -ALTER TABLE sp_target ADD COLUMN target_type BIGINT; -ALTER TABLE sp_target ADD CONSTRAINT fk_target_relation_target_type FOREIGN KEY (target_type) REFERENCES sp_target_type (id) ON DELETE SET NULL; - -ALTER TABLE sp_target_type_ds_type_relation ADD CONSTRAINT fk_target_type_relation_target_type FOREIGN KEY (target_type) REFERENCES sp_target_type (id) ON DELETE CASCADE; -ALTER TABLE sp_target_type_ds_type_relation ADD CONSTRAINT fk_target_type_relation_ds_type FOREIGN KEY (distribution_set_type) REFERENCES sp_distribution_set_type (id) ON DELETE CASCADE; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_19__add_valid_flag_to_ds___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_19__add_valid_flag_to_ds___DB2.sql deleted file mode 100644 index 3ab0e7502..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_19__add_valid_flag_to_ds___DB2.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_distribution_set ADD COLUMN valid BOOLEAN; - -UPDATE sp_distribution_set SET valid = 1; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_20__add_encryption_flag_to_sm___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_20__add_encryption_flag_to_sm___DB2.sql deleted file mode 100644 index 9249d14a1..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_20__add_encryption_flag_to_sm___DB2.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_base_software_module ADD COLUMN encrypted BOOLEAN; - -UPDATE sp_base_software_module SET encrypted = 0; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_21__add_rollouts_status_index___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_21__add_rollouts_status_index___DB2.sql deleted file mode 100644 index 4d845ed84..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_21__add_rollouts_status_index___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX sp_idx_rollout_status_tenant ON sp_rollout (tenant, status); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_22__change_target_type_name_length___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_22__change_target_type_name_length___DB2.sql deleted file mode 100644 index e7f6f7624..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_22__change_target_type_name_length___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_type ALTER COLUMN name SET DATA TYPE VARCHAR(128); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_23__add_action_status_code___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_23__add_action_status_code___DB2.sql deleted file mode 100644 index c88711e47..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_23__add_action_status_code___DB2.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_action_status ADD COLUMN code INTEGER; -CREATE INDEX sp_idx_action_status_03 ON sp_action_status (tenant, code); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_24__add_last_action_status_code___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_24__add_last_action_status_code___DB2.sql deleted file mode 100644 index ee8e263bd..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_24__add_last_action_status_code___DB2.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_action ADD COLUMN last_action_status_code INTEGER; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_25__add_confirmation_flag___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_25__add_confirmation_flag___DB2.sql deleted file mode 100644 index 5c16b5d34..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_25__add_confirmation_flag___DB2.sql +++ /dev/null @@ -1,22 +0,0 @@ -ALTER TABLE sp_rolloutgroup ADD COLUMN confirmation_required BOOLEAN; -UPDATE sp_rolloutgroup SET confirmation_required = 0; - -ALTER TABLE sp_target_filter_query ADD COLUMN confirmation_required BOOLEAN; -UPDATE sp_target_filter_query SET confirmation_required = 0; - -CREATE TABLE sp_target_conf_status -( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - target_id bigint not null, - initiator VARCHAR(64), - remark VARCHAR(512), - created_at BIGINT, - created_by VARCHAR(64), - last_modified_at BIGINT, - last_modified_by VARCHAR(64), - optlock_revision BIGINT, - tenant VARCHAR(40) not null, - primary key (id) -); -ALTER TABLE sp_target_conf_status - ADD CONSTRAINT fk_target_auto_conf FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_26__add_access_control_context___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_26__add_access_control_context___DB2.sql deleted file mode 100644 index ccf16963e..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_26__add_access_control_context___DB2.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_target_filter_query ADD COLUMN access_control_context VARCHAR(4096); -ALTER TABLE sp_rollout ADD COLUMN access_control_context VARCHAR(4096); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_27__target_type_inherit_type___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_27__target_type_inherit_type___DB2.sql deleted file mode 100644 index 86e3350b8..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_27__target_type_inherit_type___DB2.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_target_type ADD COLUMN type_key VARCHAR (64) NOT NULL DEFAULT ('_'); -UPDATE sp_target_type SET type_key = name; -ALTER TABLE sp_target_type ADD CONSTRAINT uk_target_type_key UNIQUE (type_key, tenant); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_28__add_dynamic_rollout___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_28__add_dynamic_rollout___DB2.sql deleted file mode 100644 index cff85ae84..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_28__add_dynamic_rollout___DB2.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE sp_rollout ADD COLUMN is_dynamic BOOLEAN; -ALTER TABLE sp_rolloutgroup ADD COLUMN is_dynamic BOOLEAN NOT NULL DEFAULT false; - -UPDATE sp_rollout SET weight = 1000 WHERE weight IS NULL; -UPDATE sp_action SET weight = 1000 WHERE weight IS NULL; -UPDATE sp_target_filter_query SET auto_assign_weight = 1000 WHERE auto_assign_weight IS NULL; -ALTER TABLE sp_rollout ALTER COLUMN weight SET NOT NULL; -ALTER TABLE sp_action ALTER COLUMN weight SET NOT NULL; -ALTER TABLE sp_target_filter_query ALTER COLUMN auto_assign_weight SET NOT NULL; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_29__add_ds_sm_locked___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_29__add_ds_sm_locked___DB2.sql deleted file mode 100644 index c5c0de6fb..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_29__add_ds_sm_locked___DB2.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_base_software_module ADD COLUMN locked BOOLEAN NOT NULL DEFAULT true; -ALTER TABLE sp_distribution_set ADD COLUMN locked BOOLEAN NOT NULL DEFAULT true; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_5__baseline___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_5__baseline___DB2.sql deleted file mode 100644 index 274ead21b..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_5__baseline___DB2.sql +++ /dev/null @@ -1,458 +0,0 @@ -CREATE TABLE sp_ds_type_element - ( - mandatory SMALLINT DEFAULT 0, - distribution_set_type BIGINT NOT NULL, - software_module_type BIGINT NOT NULL, - PRIMARY KEY (distribution_set_type, software_module_type) - ); - -CREATE TABLE sp_action - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - action_type INTEGER NOT NULL, - active SMALLINT DEFAULT 0, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - forced_time BIGINT, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER, - status INTEGER NOT NULL, - distribution_set BIGINT NOT NULL, - rollout BIGINT, - rolloutgroup BIGINT, - target BIGINT NOT NULL, - maintenance_cron_schedule VARCHAR(40), - maintenance_duration VARCHAR(40), - maintenance_time_zone VARCHAR(40), - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_action_01 - ON sp_action (tenant, distribution_set); - -CREATE INDEX sp_idx_action_02 - ON sp_action (tenant, target, active); - -CREATE INDEX sp_idx_action_prim - ON sp_action (tenant, id); - -CREATE TABLE sp_action_status - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - target_occurred_at BIGINT NOT NULL, - optlock_revision INTEGER, - status INTEGER NOT NULL, - action BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_action_status_02 - ON sp_action_status (tenant, action, status); - -CREATE INDEX sp_idx_action_status_prim - ON sp_action_status (tenant, id); - -CREATE TABLE sp_artifact - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - provided_file_name VARCHAR(256), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - md5_hash VARCHAR(32), - optlock_revision INTEGER, - sha1_hash VARCHAR(40) NOT NULL, - file_size BIGINT, - software_module BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_artifact_01 - ON sp_artifact (tenant, software_module); - -CREATE INDEX sp_idx_artifact_02 - ON sp_artifact (tenant, sha1_hash); - -CREATE INDEX sp_idx_artifact_prim - ON sp_artifact (tenant, id); - -CREATE TABLE sp_distribution_set - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - complete SMALLINT DEFAULT 0, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted SMALLINT DEFAULT 0, - description VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - required_migration_step SMALLINT DEFAULT 0, - VERSION VARCHAR(64) NOT NULL, - ds_id BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_distribution_set_01 - ON sp_distribution_set (tenant, deleted, complete); - -CREATE INDEX sp_idx_distribution_set_prim - ON sp_distribution_set (tenant, id); - -CREATE TABLE sp_ds_metadata - ( - meta_key VARCHAR(128) NOT NULL, - meta_value VARCHAR(4000), - ds_id BIGINT NOT NULL, - PRIMARY KEY (meta_key, ds_id) - ); - -CREATE TABLE sp_distributionset_tag - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16), - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_distribution_set_tag_prim - ON sp_distributionset_tag (tenant, id); - -CREATE TABLE sp_distribution_set_type - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16), - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted SMALLINT DEFAULT 0, - description VARCHAR(512), - type_key VARCHAR(64) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_distribution_set_type_01 - ON sp_distribution_set_type (tenant, deleted); - -CREATE INDEX sp_idx_distribution_set_type_prim - ON sp_distribution_set_type (tenant, id); - -CREATE TABLE sp_rollout - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - action_type INTEGER NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted SMALLINT DEFAULT 0, - description VARCHAR(512), - forced_time BIGINT, - last_check BIGINT, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - rollout_groups_created INTEGER, - start_at BIGINT, - status INTEGER NOT NULL, - target_filter VARCHAR(1024) NOT NULL, - total_targets BIGINT, - distribution_set BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE TABLE sp_rolloutgroup - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512), - error_action INTEGER, - error_action_exp VARCHAR(512), - error_condition INTEGER, - error_condition_exp VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - status INTEGER NOT NULL, - success_action INTEGER NOT NULL, - success_action_exp VARCHAR(512), - success_condition INTEGER NOT NULL, - success_condition_exp VARCHAR(512) NOT NULL, - target_filter VARCHAR(1024), - target_percentage FLOAT, - total_targets INTEGER, - parent_id BIGINT, - rollout BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE TABLE sp_base_software_module - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted SMALLINT DEFAULT 0, - description VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - vendor VARCHAR(256), - VERSION VARCHAR(64) NOT NULL, - module_type BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_base_sw_module_01 - ON sp_base_software_module (tenant, deleted, name, VERSION); - -CREATE INDEX sp_idx_base_sw_module_02 - ON sp_base_software_module (tenant, deleted, module_type); - -CREATE INDEX sp_idx_base_sw_module_prim - ON sp_base_software_module (tenant, id); - -CREATE TABLE sp_sw_metadata - ( - meta_key VARCHAR(128) NOT NULL, - target_visible SMALLINT DEFAULT 0, - meta_value VARCHAR(4000), - sw_id BIGINT NOT NULL, - PRIMARY KEY (meta_key, sw_id) - ); - -CREATE TABLE sp_software_module_type - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16), - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted SMALLINT DEFAULT 0, - description VARCHAR(512), - type_key VARCHAR(64) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - max_ds_assignments INTEGER NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_software_module_type_01 - ON sp_software_module_type (tenant, deleted); - -CREATE INDEX sp_idx_software_module_type_prim - ON sp_software_module_type (tenant, id); - -CREATE TABLE sp_target - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - address VARCHAR(512), - controller_id VARCHAR(64) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512), - install_date BIGINT, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - last_target_query BIGINT, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - request_controller_attributes SMALLINT DEFAULT 0 NOT NULL, - sec_token VARCHAR(128) NOT NULL, - update_status INTEGER NOT NULL, - assigned_distribution_set BIGINT, - installed_distribution_set BIGINT, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_target_01 - ON sp_target (tenant, name, assigned_distribution_set); - -CREATE INDEX sp_idx_target_03 - ON sp_target (tenant, controller_id, assigned_distribution_set); - -CREATE INDEX sp_idx_target_04 - ON sp_target (tenant, created_at); - -CREATE INDEX sp_idx_target_prim - ON sp_target (tenant, id); - -CREATE TABLE sp_target_filter_query - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - QUERY VARCHAR(1024) NOT NULL, - auto_assign_distribution_set BIGINT, - PRIMARY KEY (id) - ); - -CREATE TABLE sp_target_tag - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16), - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512), - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_target_tag_prim - ON sp_target_tag (tenant, id); - -CREATE TABLE sp_tenant_configuration - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - conf_key VARCHAR(128) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER, - conf_value VARCHAR(512) NOT NULL, - PRIMARY KEY (id) - ); - -CREATE TABLE sp_tenant - ( - id BIGINT GENERATED always AS IDENTITY NOT NULL, - created_at BIGINT NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at BIGINT NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER, - tenant VARCHAR(40) NOT NULL, - default_ds_type BIGINT NOT NULL, - PRIMARY KEY (id) - ); - -CREATE INDEX sp_idx_tenant_prim - ON sp_tenant (tenant, id); - -CREATE TABLE sp_rollouttargetgroup - ( - rolloutgroup_id BIGINT NOT NULL, - target_id BIGINT NOT NULL, - PRIMARY KEY (rolloutgroup_id, target_id) - ); - -CREATE TABLE sp_action_status_messages - ( - action_status_id BIGINT NOT NULL, - detail_message VARCHAR(512) NOT NULL - ); - -CREATE INDEX sp_idx_action_status_msgs_01 - ON sp_action_status_messages (action_status_id); - -CREATE TABLE sp_ds_module - ( - ds_id BIGINT NOT NULL, - module_id BIGINT NOT NULL, - PRIMARY KEY (ds_id, module_id) - ); - -CREATE TABLE sp_ds_dstag - ( - ds BIGINT NOT NULL, - tag BIGINT NOT NULL, - PRIMARY KEY (ds, tag) - ); - -CREATE TABLE sp_target_attributes - ( - target_id BIGINT NOT NULL, - attribute_value VARCHAR(128), - attribute_key VARCHAR(32) NOT NULL - ); - -CREATE TABLE sp_target_target_tag - ( - target BIGINT NOT NULL, - tag BIGINT NOT NULL, - PRIMARY KEY (target, tag) - ); - -ALTER TABLE sp_distribution_set ADD CONSTRAINT uk_distrib_set UNIQUE (name, version, tenant); -ALTER TABLE sp_distributionset_tag ADD CONSTRAINT uk_ds_tag UNIQUE (name, tenant); -ALTER TABLE sp_distribution_set_type ADD CONSTRAINT uk_dst_name UNIQUE (name, tenant); -ALTER TABLE sp_distribution_set_type ADD CONSTRAINT uk_dst_key UNIQUE (type_key, tenant); -ALTER TABLE sp_rollout ADD CONSTRAINT uk_rollout UNIQUE (name, tenant); -ALTER TABLE sp_rolloutgroup ADD CONSTRAINT uk_rolloutgroup UNIQUE (name, rollout, tenant); -ALTER TABLE sp_base_software_module ADD CONSTRAINT uk_base_sw_mod UNIQUE (module_type, name, version, tenant); -ALTER TABLE sp_software_module_type ADD CONSTRAINT uk_smt_type_key UNIQUE (type_key, tenant); -ALTER TABLE sp_software_module_type ADD CONSTRAINT uk_smt_name UNIQUE (name, tenant); -ALTER TABLE sp_target ADD CONSTRAINT uk_tenant_controller_ UNIQUE (controller_id, tenant); -ALTER TABLE sp_target_filter_query ADD CONSTRAINT uk_tenant_custom_filt UNIQUE (name, tenant); -ALTER TABLE sp_target_tag ADD CONSTRAINT uk_targ_tag UNIQUE (name, tenant); -ALTER TABLE sp_tenant_configuration ADD CONSTRAINT uk_tenant_key UNIQUE (conf_key, tenant); -ALTER TABLE sp_tenant ADD CONSTRAINT uk_tenantmd_tenant UNIQUE (tenant); - -ALTER TABLE sp_ds_type_element ADD CONSTRAINT fk_ds_type_element_element FOREIGN KEY (distribution_set_type) REFERENCES sp_distribution_set_type (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_type_element ADD CONSTRAINT fk_ds_type_element_smtype FOREIGN KEY (software_module_type) REFERENCES sp_software_module_type (id) ON DELETE CASCADE; -ALTER TABLE sp_action ADD CONSTRAINT fk_action_rolloutgroup FOREIGN KEY (rolloutgroup) REFERENCES sp_rolloutgroup (id); -ALTER TABLE sp_action ADD CONSTRAINT fk_action_rollout FOREIGN KEY (rolloutgroup) REFERENCES sp_rolloutgroup (id); -ALTER TABLE sp_action ADD CONSTRAINT fk_targ_act_hist_targ FOREIGN KEY (target) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_action ADD CONSTRAINT fk_action_ds FOREIGN KEY (distribution_set) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_action_status ADD CONSTRAINT fk_act_stat_action FOREIGN KEY (action) REFERENCES sp_action (id) ON DELETE CASCADE; -ALTER TABLE sp_artifact ADD CONSTRAINT fk_assigned_sm FOREIGN KEY (software_module) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_distribution_set ADD CONSTRAINT fk_ds_dstype_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set_type (id); -ALTER TABLE sp_ds_metadata ADD CONSTRAINT fk_metadata_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_rollout ADD CONSTRAINT fk_rollout_ds FOREIGN KEY (distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_rolloutgroup ADD CONSTRAINT fk_rolloutgroup_rollout FOREIGN KEY (rollout) REFERENCES sp_rollout (id) ON DELETE CASCADE; -ALTER TABLE sp_base_software_module ADD CONSTRAINT fk_module_type FOREIGN KEY (module_type) REFERENCES sp_software_module_type (id); -ALTER TABLE sp_sw_metadata ADD CONSTRAINT fk_metadata_sw FOREIGN KEY (sw_id) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_target ADD CONSTRAINT fk_target_inst_ds FOREIGN KEY (installed_distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_target ADD CONSTRAINT fk_target_assign_ds FOREIGN KEY (assigned_distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_target_filter_query ADD CONSTRAINT fk_filter_auto_assign_ds FOREIGN KEY (auto_assign_distribution_set) REFERENCES sp_distribution_set (id) ON DELETE SET NULL; -ALTER TABLE sp_tenant ADD CONSTRAINT fk_tenant_md_default_ds_type FOREIGN KEY (default_ds_type) REFERENCES sp_distribution_set_type (id); -ALTER TABLE sp_rollouttargetgroup ADD CONSTRAINT fk_rollouttargetgroup_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_rollouttargetgroup ADD CONSTRAINT fk_rollouttargetgroup_group FOREIGN KEY (rolloutGroup_Id) REFERENCES sp_rolloutgroup (id) ON DELETE CASCADE; -ALTER TABLE sp_action_status_messages ADD CONSTRAINT fk_stat_msg_act_stat FOREIGN KEY (action_status_id) REFERENCES sp_action_status (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_module ADD CONSTRAINT fk_ds_module_module FOREIGN KEY (module_id) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_module ADD CONSTRAINT fk_ds_module_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_dstag ADD CONSTRAINT fk_ds_dstag_tag FOREIGN KEY (tag) REFERENCES sp_distributionset_tag (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_dstag ADD CONSTRAINT fk_ds_dstag_ds FOREIGN KEY (ds) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_target_attributes ADD CONSTRAINT fk_targ_attrib_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_target_target_tag ADD CONSTRAINT fk_targ_targtag_tag FOREIGN KEY (tag) REFERENCES sp_target_tag (id) ON DELETE CASCADE; -ALTER TABLE sp_target_target_tag ADD CONSTRAINT fk_targ_targtag_target FOREIGN KEY (target) REFERENCES sp_target (id) ON DELETE CASCADE; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_6__add_index___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_6__add_index___DB2.sql deleted file mode 100644 index d7d7d6cc7..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_6__add_index___DB2.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE INDEX sp_idx_target_tag_01 ON sp_target_tag (tenant, name); -CREATE INDEX sp_idx_distribution_set_tag_01 ON sp_distributionset_tag (tenant, name); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql deleted file mode 100644 index 93824dc9d..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_rollout ADD COLUMN approval_decided_by varchar(40); -ALTER TABLE sp_rollout ADD COLUMN approval_remark varchar(255); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql deleted file mode 100644 index 46d0b8f3c..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql +++ /dev/null @@ -1,45 +0,0 @@ -ALTER TABLE sp_action ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_action ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_action_status ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_action_status ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_artifact ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_artifact ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_base_software_module ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_base_software_module ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_distributionset_tag ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_distributionset_tag ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_distribution_set ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_distribution_set ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_distribution_set_type ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_distribution_set_type ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_rollout ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_rollout ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_rollout ALTER COLUMN approval_decided_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_rolloutgroup ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_rolloutgroup ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_software_module_type ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_software_module_type ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_target ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_target ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_target_filter_query ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_target_filter_query ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_target_tag ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_target_tag ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_tenant ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_tenant ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); - -ALTER TABLE sp_tenant_configuration ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); -ALTER TABLE sp_tenant_configuration ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_9__add_target_metadata___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_9__add_target_metadata___DB2.sql deleted file mode 100644 index 027af4dd6..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/DB2/V1_12_9__add_target_metadata___DB2.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE sp_target_metadata -( - meta_key VARCHAR(128) NOT NULL, - meta_value VARCHAR(4000), - target_id BIGINT NOT NULL, - PRIMARY KEY (meta_key, target_id) -); - -ALTER TABLE sp_target_metadata ADD CONSTRAINT fk_metadata_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_10__change_length_of_target_attributes_key___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_10__change_length_of_target_attributes_key___SQL_SERVER.sql deleted file mode 100644 index 55f3eed5e..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_10__change_length_of_target_attributes_key___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_attributes ALTER COLUMN attribute_key VARCHAR(128); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_11__add_auto_assign_action_type___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_11__add_auto_assign_action_type___SQL_SERVER.sql deleted file mode 100644 index 0e8c37bda..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_11__add_auto_assign_action_type___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_filter_query ADD auto_assign_action_type INTEGER; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_12__change_length_of_controller_id_and_name___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_12__change_length_of_controller_id_and_name___SQL_SERVER.sql deleted file mode 100644 index b9b5e2a28..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_12__change_length_of_controller_id_and_name___SQL_SERVER.sql +++ /dev/null @@ -1,13 +0,0 @@ -ALTER TABLE sp_distribution_set ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_distribution_set_type ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_distributionset_tag ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_base_software_module ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_rollout ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_rolloutgroup ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_software_module_type ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_target ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_target_filter_query ALTER COLUMN name VARCHAR(128); -ALTER TABLE sp_target_tag ALTER COLUMN name VARCHAR(128); - - -ALTER TABLE sp_target ALTER COLUMN controller_id VARCHAR(256); diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_13__add_action_external_id___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_13__add_action_external_id___SQL_SERVER.sql deleted file mode 100644 index b5ca92aec..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_13__add_action_external_id___SQL_SERVER.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE sp_action ADD external_ref VARCHAR(512); -CREATE INDEX sp_idx_action_external_ref ON sp_action (external_ref); - - \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_14__add_sha256_hash___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_14__add_sha256_hash___SQL_SERVER.sql deleted file mode 100644 index c72b8b124..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_14__add_sha256_hash___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_artifact ADD sha256_hash CHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_15__add_weight___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_15__add_weight___SQL_SERVER.sql deleted file mode 100644 index 9eaad20e1..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_15__add_weight___SQL_SERVER.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_action ADD weight INT; -ALTER TABLE sp_rollout ADD weight INT; -ALTER TABLE sp_target_filter_query ADD auto_assign_weight INT; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql deleted file mode 100644 index dc6eae613..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_action ADD initiated_by VARCHAR(64) NOT NULL CONSTRAINT DF_SpAction_InitiatedBy DEFAULT ''; -ALTER TABLE sp_action DROP CONSTRAINT DF_SpAction_InitiatedBy; -ALTER TABLE sp_target_filter_query ADD auto_assign_initiated_by VARCHAR(64); diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_17__add_index_target_modified___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_17__add_index_target_modified___SQL_SERVER.sql deleted file mode 100644 index ac70ee7f0..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_17__add_index_target_modified___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX sp_idx_target_05 ON sp_target (tenant, last_modified_at); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_18__add_target_type___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_18__add_target_type___SQL_SERVER.sql deleted file mode 100644 index 924e0681c..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_18__add_target_type___SQL_SERVER.sql +++ /dev/null @@ -1,27 +0,0 @@ -CREATE TABLE sp_target_type -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16) NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(64) NOT NULL, - description VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(64) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_target_type_prim ON sp_target_type (tenant, id); -CREATE TABLE sp_target_type_ds_type_relation -( - target_type NUMERIC(19) NOT NULL, - distribution_set_type NUMERIC(19) NOT NULL, - PRIMARY KEY (target_type, distribution_set_type) -); -ALTER TABLE sp_target_type ADD CONSTRAINT uk_target_type_name UNIQUE (name, tenant); -ALTER TABLE sp_target ADD target_type NUMERIC(19) NULL; -ALTER TABLE sp_target ADD CONSTRAINT fk_target_relation_target_type FOREIGN KEY (target_type) REFERENCES sp_target_type (id) ON DELETE SET NULL; -ALTER TABLE sp_target_type_ds_type_relation ADD CONSTRAINT fk_target_type_relation_target_type FOREIGN KEY (target_type) REFERENCES sp_target_type (id) ON DELETE CASCADE; -ALTER TABLE sp_target_type_ds_type_relation ADD CONSTRAINT fk_target_type_relation_ds_type FOREIGN KEY (distribution_set_type) REFERENCES sp_distribution_set_type (id) ON DELETE CASCADE; - diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_19__add_valid_flag_to_ds___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_19__add_valid_flag_to_ds___SQL_SERVER.sql deleted file mode 100644 index 1ec1d0407..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_19__add_valid_flag_to_ds___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_distribution_set ADD valid BIT DEFAULT 1; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_20__add_encryption_flag_to_sm___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_20__add_encryption_flag_to_sm___SQL_SERVER.sql deleted file mode 100644 index 092fdbdcc..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_20__add_encryption_flag_to_sm___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_base_software_module ADD encrypted BIT DEFAULT 0; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_21__add_rollouts_status_index___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_21__add_rollouts_status_index___SQL_SERVER.sql deleted file mode 100644 index 4d845ed84..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_21__add_rollouts_status_index___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX sp_idx_rollout_status_tenant ON sp_rollout (tenant, status); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_22__fix_target_type_name___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_22__fix_target_type_name___SQL_SERVER.sql deleted file mode 100644 index a1842d526..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_22__fix_target_type_name___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_target_type ALTER COLUMN name VARCHAR (128) NOT NULL; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_23__add_action_status_code___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_23__add_action_status_code___SQL_SERVER.sql deleted file mode 100644 index 38a6aeaab..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_23__add_action_status_code___SQL_SERVER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_action_status ADD code INT; -CREATE INDEX sp_idx_action_status_03 ON sp_action_status (tenant, code); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_24__add_last_action_status_code___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_24__add_last_action_status_code___SQL_SERVER.sql deleted file mode 100644 index db38eeb10..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_24__add_last_action_status_code___SQL_SERVER.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE sp_action ADD last_action_status_code INT; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_25__add_confirmation_flag___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_25__add_confirmation_flag___SQL_SERVER.sql deleted file mode 100644 index 0cd9e2fef..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_25__add_confirmation_flag___SQL_SERVER.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE sp_rolloutgroup ADD confirmation_required BIT DEFAULT 0; -ALTER TABLE sp_target_filter_query ADD confirmation_required BIT DEFAULT 0; - -CREATE TABLE sp_target_conf_status -( - id NUMERIC(19) IDENTITY NOT NULL, - target_id NUMERIC(19) NOT NULL, - initiator VARCHAR(64), - remark VARCHAR(512), - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(64) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -ALTER TABLE sp_target_conf_status - ADD CONSTRAINT fk_target_auto_conf FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_26__add_access_control_context___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_26__add_access_control_context___SQL_SERVER.sql deleted file mode 100644 index 24f81bc7e..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_26__add_access_control_context___SQL_SERVER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_target_filter_query ADD access_control_context VARCHAR(4096); -ALTER TABLE sp_rollout ADD access_control_context VARCHAR(4096); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_27__target_type_inherit_type___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_27__target_type_inherit_type___SQL_SERVER.sql deleted file mode 100644 index f64339420..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_27__target_type_inherit_type___SQL_SERVER.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE sp_target_type ADD type_key VARCHAR (64) NOT NULL DEFAULT ('_'); -UPDATE sp_target_type SET type_key = name; -ALTER TABLE sp_target_type ADD CONSTRAINT uk_target_type_key UNIQUE (type_key, tenant); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_28__add_dynamic_rollout___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_28__add_dynamic_rollout___SQL_SERVER.sql deleted file mode 100644 index a22a7f997..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_28__add_dynamic_rollout___SQL_SERVER.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE sp_rollout ADD is_dynamic BIT; -ALTER TABLE sp_rolloutgroup ADD is_dynamic BIT NOT NULL DEFAULT 0; - -UPDATE sp_rollout SET weight = 1000 WHERE weight IS NULL; -UPDATE sp_action SET weight = 1000 WHERE weight IS NULL; -UPDATE sp_target_filter_query SET auto_assign_weight = 1000 WHERE auto_assign_weight IS NULL; -ALTER TABLE sp_rollout ALTER COLUMN weight INT NOT NULL; -ALTER TABLE sp_action ALTER COLUMN weight INT NOT NULL; -ALTER TABLE sp_target_filter_query ALTER COLUMN auto_assign_weight INT NOT NULL; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_29__add_ds_sm_locked___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_29__add_ds_sm_locked___SQL_SERVER.sql deleted file mode 100644 index 946d0b8e0..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_29__add_ds_sm_locked___SQL_SERVER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_base_software_module ADD locked BIT NOT NULL DEFAULT 1; -ALTER TABLE sp_distribution_set ADD locked BIT NOT NULL DEFAULT 1; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_5__baseline___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_5__baseline___SQL_SERVER.sql deleted file mode 100644 index 42a3895b4..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_5__baseline___SQL_SERVER.sql +++ /dev/null @@ -1,383 +0,0 @@ -CREATE TABLE sp_ds_type_element -( - mandatory BIT default 0 NULL, - distribution_set_type NUMERIC(19) NOT NULL, - software_module_type NUMERIC(19) NOT NULL, - PRIMARY KEY (distribution_set_type, software_module_type) -); -CREATE TABLE sp_action -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - action_type INTEGER NOT NULL, - active BIT default 0 NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - forced_time NUMERIC(19) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER NULL, - status INTEGER NOT NULL, - distribution_set NUMERIC(19) NOT NULL, - rollout NUMERIC(19) NULL, - rolloutgroup NUMERIC(19) NULL, - target NUMERIC(19) NOT NULL, - maintenance_cron_schedule VARCHAR(40), - maintenance_duration VARCHAR(40), - maintenance_time_zone VARCHAR(40), - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_action_01 ON sp_action (tenant, distribution_set); -CREATE INDEX sp_idx_action_02 ON sp_action (tenant, target, active); -CREATE INDEX sp_idx_action_prim ON sp_action (tenant, id); -CREATE TABLE sp_action_status -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - target_occurred_at NUMERIC(19) NOT NULL, - optlock_revision INTEGER NULL, - status INTEGER NOT NULL, - action NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_action_status_02 ON sp_action_status (tenant, action, status); -CREATE INDEX sp_idx_action_status_prim ON sp_action_status (tenant, id); -CREATE TABLE sp_artifact -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - provided_file_name VARCHAR(256) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - md5_hash VARCHAR(32) NULL, - optlock_revision INTEGER NULL, - sha1_hash VARCHAR(40) NOT NULL, - file_size NUMERIC(19) NULL, - software_module NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_artifact_01 ON sp_artifact (tenant, software_module); -CREATE INDEX sp_idx_artifact_02 ON sp_artifact (tenant, sha1_hash); -CREATE INDEX sp_idx_artifact_prim ON sp_artifact (tenant, id); -CREATE TABLE sp_distribution_set -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - complete BIT default 0 NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted BIT default 0 NULL, - description VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - required_migration_step BIT default 0 NULL, - version VARCHAR(64) NOT NULL, - ds_id NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_distribution_set_01 ON sp_distribution_set (tenant, deleted, complete); -CREATE INDEX sp_idx_distribution_set_prim ON sp_distribution_set (tenant, id); -CREATE TABLE sp_ds_metadata -( - meta_key VARCHAR(128) NOT NULL, - meta_value VARCHAR(4000) NULL, - ds_id NUMERIC(19) NOT NULL, - PRIMARY KEY (meta_key, ds_id) -); -CREATE TABLE sp_distributionset_tag -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16) NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_distribution_set_tag_prim ON sp_distributionset_tag (tenant, id); -CREATE TABLE sp_distribution_set_type -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16) NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted BIT default 0 NULL, - description VARCHAR(512) NULL, - type_key VARCHAR(64) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_distribution_set_type_01 ON sp_distribution_set_type (tenant, deleted); -CREATE INDEX sp_idx_distribution_set_type_prim ON sp_distribution_set_type (tenant, id); -CREATE TABLE sp_rollout -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - action_type INTEGER NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted BIT default 0 NULL, - description VARCHAR(512) NULL, - forced_time NUMERIC(19) NULL, - last_check NUMERIC(19) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - rollout_groups_created INTEGER NULL, - start_at NUMERIC(19) NULL, - status INTEGER NOT NULL, - target_filter VARCHAR(1024) NOT NULL, - total_targets NUMERIC(19) NULL, - distribution_set NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE TABLE sp_rolloutgroup -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512) NULL, - error_action INTEGER NULL, - error_action_exp VARCHAR(512) NULL, - error_condition INTEGER NULL, - error_condition_exp VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - status INTEGER NOT NULL, - success_action INTEGER NOT NULL, - success_action_exp VARCHAR(512) NULL, - success_condition INTEGER NOT NULL, - success_condition_exp VARCHAR(512) NOT NULL, - target_filter VARCHAR(1024) NULL, - target_percentage FLOAT(16) NULL, - total_targets INTEGER NULL, - parent_id NUMERIC(19) NULL, - rollout NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE TABLE sp_base_software_module -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted BIT default 0 NULL, - description VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - vendor VARCHAR(256) NULL, - version VARCHAR(64) NOT NULL, - module_type NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_base_sw_module_01 ON sp_base_software_module (tenant, deleted, name, version); -CREATE INDEX sp_idx_base_sw_module_02 ON sp_base_software_module (tenant, deleted, module_type); -CREATE INDEX sp_idx_base_sw_module_prim ON sp_base_software_module (tenant, id); -CREATE TABLE sp_sw_metadata -( - meta_key VARCHAR(128) NOT NULL, - target_visible BIT default 0 NULL, - meta_value VARCHAR(4000) NULL, - sw_id NUMERIC(19) NOT NULL, - PRIMARY KEY (meta_key, sw_id) -); -CREATE TABLE sp_software_module_type -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16) NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - deleted BIT default 0 NULL, - description VARCHAR(512) NULL, - type_key VARCHAR(64) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - max_ds_assignments INTEGER NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_software_module_type_01 ON sp_software_module_type (tenant, deleted); -CREATE INDEX sp_idx_software_module_type_prim ON sp_software_module_type (tenant, id); -CREATE TABLE sp_target -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - address VARCHAR(512) NULL, - controller_id VARCHAR(64) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512) NULL, - install_date NUMERIC(19) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - last_target_query NUMERIC(19) NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - request_controller_attributes BIT default 0 NOT NULL, - sec_token VARCHAR(128) NOT NULL, - update_status INTEGER NOT NULL, - assigned_distribution_set NUMERIC(19) NULL, - installed_distribution_set NUMERIC(19) NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_target_01 ON sp_target (tenant, name, assigned_distribution_set); -CREATE INDEX sp_idx_target_03 ON sp_target (tenant, controller_id, assigned_distribution_set); -CREATE INDEX sp_idx_target_04 ON sp_target (tenant, created_at); -CREATE INDEX sp_idx_target_prim ON sp_target (tenant, id); -CREATE TABLE sp_target_filter_query -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - query VARCHAR(1024) NOT NULL, - auto_assign_distribution_set NUMERIC(19) NULL, - PRIMARY KEY (id) -); -CREATE TABLE sp_target_tag -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - colour VARCHAR(16) NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - description VARCHAR(512) NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - name VARCHAR(64) NOT NULL, - optlock_revision INTEGER NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_target_tag_prim ON sp_target_tag (tenant, id); -CREATE TABLE sp_tenant_configuration -( - id NUMERIC(19) IDENTITY NOT NULL, - tenant VARCHAR(40) NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - conf_key VARCHAR(128) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER NULL, - conf_value VARCHAR(512) NOT NULL, - PRIMARY KEY (id) -); -CREATE TABLE sp_tenant -( - id NUMERIC(19) IDENTITY NOT NULL, - created_at NUMERIC(19) NOT NULL, - created_by VARCHAR(40) NOT NULL, - last_modified_at NUMERIC(19) NOT NULL, - last_modified_by VARCHAR(40) NOT NULL, - optlock_revision INTEGER NULL, - tenant VARCHAR(40) NOT NULL, - default_ds_type NUMERIC(19) NOT NULL, - PRIMARY KEY (id) -); -CREATE INDEX sp_idx_tenant_prim ON sp_tenant (tenant, id); -CREATE TABLE sp_rollouttargetgroup -( - rolloutGroup_Id NUMERIC(19) NOT NULL, - target_id NUMERIC(19) NOT NULL, - PRIMARY KEY (rolloutGroup_Id, target_id) -); -CREATE TABLE sp_action_status_messages -( - action_status_id NUMERIC(19) NOT NULL, - detail_message VARCHAR(512) NOT NULL -); -CREATE INDEX sp_idx_action_status_msgs_01 ON sp_action_status_messages (action_status_id); -CREATE TABLE sp_ds_module -( - ds_id NUMERIC(19) NOT NULL, - module_id NUMERIC(19) NOT NULL, - PRIMARY KEY (ds_id, module_id) -); -CREATE TABLE sp_ds_dstag -( - ds NUMERIC(19) NOT NULL, - TAG NUMERIC(19) NOT NULL, - PRIMARY KEY (ds, TAG) -); -CREATE TABLE sp_target_attributes -( - target_id NUMERIC(19) NOT NULL, - attribute_value VARCHAR(128) NULL, - attribute_key VARCHAR(32) NOT NULL -); -CREATE TABLE sp_target_target_tag -( - target NUMERIC(19) NOT NULL, - tag NUMERIC(19) NOT NULL, - PRIMARY KEY (target, tag) -); -ALTER TABLE sp_distribution_set ADD CONSTRAINT uk_distrib_set UNIQUE (name, version, tenant); -ALTER TABLE sp_distributionset_tag ADD CONSTRAINT uk_ds_tag UNIQUE (name, tenant); -ALTER TABLE sp_distribution_set_type ADD CONSTRAINT uk_dst_name UNIQUE (name, tenant); -ALTER TABLE sp_distribution_set_type ADD CONSTRAINT uk_dst_key UNIQUE (type_key, tenant); -ALTER TABLE sp_rollout ADD CONSTRAINT uk_rollout UNIQUE (name, tenant); -ALTER TABLE sp_rolloutgroup ADD CONSTRAINT uk_rolloutgroup UNIQUE (name, rollout, tenant); -ALTER TABLE sp_base_software_module ADD CONSTRAINT uk_base_sw_mod UNIQUE (module_type, name, version, tenant); -ALTER TABLE sp_software_module_type ADD CONSTRAINT uk_smt_type_key UNIQUE (type_key, tenant); -ALTER TABLE sp_software_module_type ADD CONSTRAINT uk_smt_name UNIQUE (name, tenant); -ALTER TABLE sp_target ADD CONSTRAINT uk_tenant_controller_ UNIQUE (controller_id, tenant); -ALTER TABLE sp_target_filter_query ADD CONSTRAINT uk_tenant_custom_filt UNIQUE (name, tenant); -ALTER TABLE sp_target_tag ADD CONSTRAINT uk_targ_tag UNIQUE (name, tenant); -ALTER TABLE sp_tenant_configuration ADD CONSTRAINT uk_tenant_key UNIQUE (conf_key, tenant); -ALTER TABLE sp_tenant ADD CONSTRAINT uk_tenantmd_tenant UNIQUE (tenant); -ALTER TABLE sp_ds_type_element ADD CONSTRAINT fk_ds_type_element_element FOREIGN KEY (distribution_set_type) REFERENCES sp_distribution_set_type (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_type_element ADD CONSTRAINT fk_ds_type_element_smtype FOREIGN KEY (software_module_type) REFERENCES sp_software_module_type (id) ON DELETE CASCADE; -ALTER TABLE sp_action ADD CONSTRAINT fk_action_rolloutgroup FOREIGN KEY (rolloutgroup) REFERENCES sp_rolloutgroup (id); -ALTER TABLE sp_action ADD CONSTRAINT fk_action_rollout FOREIGN KEY (rolloutgroup) REFERENCES sp_rolloutgroup (id); -ALTER TABLE sp_action ADD CONSTRAINT fk_targ_act_hist_targ FOREIGN KEY (target) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_action ADD CONSTRAINT fk_action_ds FOREIGN KEY (distribution_set) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_action_status ADD CONSTRAINT fk_act_stat_action FOREIGN KEY (action) REFERENCES sp_action (id) ON DELETE CASCADE; -ALTER TABLE sp_artifact ADD CONSTRAINT fk_assigned_sm FOREIGN KEY (software_module) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_distribution_set ADD CONSTRAINT fk_ds_dstype_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set_type (id); -ALTER TABLE sp_ds_metadata ADD CONSTRAINT fk_metadata_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_rollout ADD CONSTRAINT fk_rollout_ds FOREIGN KEY (distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_rolloutgroup ADD CONSTRAINT fk_rolloutgroup_rollout FOREIGN KEY (rollout) REFERENCES sp_rollout (id) ON DELETE CASCADE; -ALTER TABLE sp_base_software_module ADD CONSTRAINT fk_module_type FOREIGN KEY (module_type) REFERENCES sp_software_module_type (id); -ALTER TABLE sp_sw_metadata ADD CONSTRAINT fk_metadata_sw FOREIGN KEY (sw_id) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_target ADD CONSTRAINT fk_target_inst_ds FOREIGN KEY (installed_distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_target ADD CONSTRAINT fk_target_assign_ds FOREIGN KEY (assigned_distribution_set) REFERENCES sp_distribution_set (id); -ALTER TABLE sp_target_filter_query ADD CONSTRAINT fk_filter_auto_assign_ds FOREIGN KEY (auto_assign_distribution_set) REFERENCES sp_distribution_set (id) ON DELETE SET NULL; -ALTER TABLE sp_tenant ADD CONSTRAINT fk_tenant_md_default_ds_type FOREIGN KEY (default_ds_type) REFERENCES sp_distribution_set_type (id); -ALTER TABLE sp_rollouttargetgroup ADD CONSTRAINT fk_rollouttargetgroup_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_rollouttargetgroup ADD CONSTRAINT fk_rollouttargetgroup_group FOREIGN KEY (rolloutGroup_Id) REFERENCES sp_rolloutgroup (id) ON DELETE CASCADE; -ALTER TABLE sp_action_status_messages ADD CONSTRAINT fk_stat_msg_act_stat FOREIGN KEY (action_status_id) REFERENCES sp_action_status (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_module ADD CONSTRAINT fk_ds_module_module FOREIGN KEY (module_id) REFERENCES sp_base_software_module (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_module ADD CONSTRAINT fk_ds_module_ds FOREIGN KEY (ds_id) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_dstag ADD CONSTRAINT fk_ds_dstag_tag FOREIGN KEY (tag) REFERENCES sp_distributionset_tag (id) ON DELETE CASCADE; -ALTER TABLE sp_ds_dstag ADD CONSTRAINT fk_ds_dstag_ds FOREIGN KEY (ds) REFERENCES sp_distribution_set (id) ON DELETE CASCADE; -ALTER TABLE sp_target_attributes ADD CONSTRAINT fk_targ_attrib_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; -ALTER TABLE sp_target_target_tag ADD CONSTRAINT fk_targ_targtag_tag FOREIGN KEY (tag) REFERENCES sp_target_tag (id) ON DELETE CASCADE; -ALTER TABLE sp_target_target_tag ADD CONSTRAINT fk_targ_targtag_target FOREIGN KEY (target) REFERENCES sp_target (id) ON DELETE CASCADE; diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_6__add_index___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_6__add_index___SQL_SERVER.sql deleted file mode 100644 index d7d7d6cc7..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_6__add_index___SQL_SERVER.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE INDEX sp_idx_target_tag_01 ON sp_target_tag (tenant, name); -CREATE INDEX sp_idx_distribution_set_tag_01 ON sp_distributionset_tag (tenant, name); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql deleted file mode 100644 index 18d86a1ee..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE sp_rollout ADD approval_decided_by varchar(40); -ALTER TABLE sp_rollout ADD approval_remark varchar(255); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql deleted file mode 100644 index a89ece18d..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql +++ /dev/null @@ -1,45 +0,0 @@ -ALTER TABLE sp_action ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_action ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_action_status ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_action_status ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_artifact ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_artifact ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_base_software_module ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_base_software_module ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_distributionset_tag ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_distributionset_tag ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_distribution_set ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_distribution_set ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_distribution_set_type ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_distribution_set_type ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_rollout ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_rollout ALTER COLUMN last_modified_by VARCHAR(64); -ALTER TABLE sp_rollout ALTER COLUMN approval_decided_by VARCHAR(64); - -ALTER TABLE sp_rolloutgroup ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_rolloutgroup ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_software_module_type ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_software_module_type ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_target ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_target ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_target_filter_query ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_target_filter_query ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_target_tag ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_target_tag ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_tenant ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_tenant ALTER COLUMN last_modified_by VARCHAR(64); - -ALTER TABLE sp_tenant_configuration ALTER COLUMN created_by VARCHAR(64); -ALTER TABLE sp_tenant_configuration ALTER COLUMN last_modified_by VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_9__add_target_metadata___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_9__add_target_metadata___SQL_SERVER.sql deleted file mode 100644 index baa8cf292..000000000 --- a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/SQL_SERVER/V1_12_9__add_target_metadata___SQL_SERVER.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE sp_target_metadata -( - meta_key VARCHAR(128) NOT NULL, - meta_value VARCHAR(4000) NULL, - target_id NUMERIC(19) NOT NULL, - PRIMARY KEY (meta_key, target_id) -); - -ALTER TABLE sp_target_metadata ADD CONSTRAINT fk_metadata_target FOREIGN KEY (target_id) REFERENCES sp_target (id) ON DELETE CASCADE; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java index bdef4fd22..5ce08aa2b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java @@ -350,6 +350,9 @@ class RSQLUtilityTest { verify(criteriaBuilderMock, times(1)).like(pathOfString(baseSoftwareModuleRootMock), "a\\%%".toUpperCase(), '\\'); } + // MsSQL is not officially supported + // thought it may be available through configuration and adding necessarily dependencies + // so we keep RSQL compatibility testing @Test void correctRsqlBuildsLikePredicateWithPercentageSQLServer() { reset0(baseSoftwareModuleRootMock, criteriaQueryMock, criteriaBuilderMock); @@ -358,8 +361,7 @@ class RSQLUtilityTest { when(baseSoftwareModuleRootMock.getJavaType()).thenReturn((Class) String.class); when(criteriaBuilderMock.upper(pathOfString(baseSoftwareModuleRootMock))).thenReturn(pathOfString(baseSoftwareModuleRootMock)); when(criteriaBuilderMock.like(any(Expression.class), anyString(), eq('\\'))).thenReturn(mock(Predicate.class)); - when(criteriaBuilderMock. greaterThanOrEqualTo(any(Expression.class), any(String.class))) - .thenReturn(mock(Predicate.class)); + when(criteriaBuilderMock. greaterThanOrEqualTo(any(Expression.class), any(String.class))).thenReturn(mock(Predicate.class)); // test RSQLUtility.buildRsqlSpecification(correctRsql, SoftwareModuleFields.class, null, Database.SQL_SERVER) diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml index b3f587494..b096571be 100644 --- a/hawkbit-repository/hawkbit-repository-test/pom.xml +++ b/hawkbit-repository/hawkbit-repository-test/pom.xml @@ -60,10 +60,6 @@ org.postgresql postgresql - - com.microsoft.sqlserver - mssql-jdbc - org.mariadb.jdbc mariadb-java-client @@ -74,10 +70,6 @@ org.flywaydb flyway-database-postgresql - - org.flywaydb - flyway-sqlserver - org.flywaydb flyway-mysql diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MsSqlTestDatabase.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MsSqlTestDatabase.java deleted file mode 100644 index b35c4554c..000000000 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/MsSqlTestDatabase.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.hawkbit.repository.test.util; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.extension.Extension; - -/** - * An {@link Extension} for creating and dropping MS SQL Server - * schemas if tests are set up with MS SQL Server. - */ -@Slf4j -public class MsSqlTestDatabase extends AbstractSqlTestDatabase { - - private static final String DATABASE_AND_SURROUNDINGS = ";database="; - - public MsSqlTestDatabase(final DatasourceContext context) { - super(context); - } - - @Override - public MsSqlTestDatabase createRandomSchema() { - final String uri = context.getDatasourceUrl(); - log.info("\033[0;33mCreating mssql schema {} \033[0m", context.getRandomSchemaName()); - - executeStatement(uri.split(DATABASE_AND_SURROUNDINGS)[0], "CREATE DATABASE " + context.getRandomSchemaName() + ";"); - return this; - } - - @Override - protected void dropRandomSchema() { - final String uri = context.getDatasourceUrl(); - final String dbServerUri = uri.split(DATABASE_AND_SURROUNDINGS)[0]; - log.info("\033[0;33mDropping mssql schema {} \033[0m", context.getRandomSchemaName()); - - // Needed to avoid the DROP is rejected with "database still in use" - executeStatement(dbServerUri, "ALTER DATABASE " + context.getRandomSchemaName() + " SET SINGLE_USER WITH ROLLBACK IMMEDIATE;"); - executeStatement(dbServerUri, "DROP DATABASE " + context.getRandomSchemaName() + ";"); - } - - @Override - protected String getRandomSchemaUri() { - final String uri = context.getDatasourceUrl(); - return uri.substring(0, uri.indexOf(';')) + DATABASE_AND_SURROUNDINGS + context.getRandomSchemaName(); - } -} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SharedSqlTestDatabaseExtension.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SharedSqlTestDatabaseExtension.java index bdc9dd0bf..b1a800d9e 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SharedSqlTestDatabaseExtension.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SharedSqlTestDatabaseExtension.java @@ -56,9 +56,6 @@ public class SharedSqlTestDatabaseExtension implements BeforeAllCallback { case "H2": database = new H2TestDatabase(context); break; - case "SQL_SERVER": - database = new MsSqlTestDatabase(context); - break; case "MYSQL": database = new MySqlTestDatabase(context); break;