From ba2b3a6427240bd1d076a1d7c1295aa3e4899dbe Mon Sep 17 00:00:00 2001 From: Stefan Klotz <35995139+StefanKlt@users.noreply.github.com> Date: Mon, 8 Feb 2021 10:17:45 +0100 Subject: [PATCH] Fix database migration scripts (#1061) * fix sql server migration Signed-off-by: Stefan Klotz * fix postgres migration Signed-off-by: Stefan Klotz * fix db2 migration Signed-off-by: Stefan Klotz --- .../DB2/V1_12_16__add_action_initiated_by___DB2.sql | 3 ++- .../V1_12_16__add_action_initiated_by___POSTGRESQL.sql | 6 ++++-- .../V1_12_16__add_action_initiated_by___SQL_SERVER.sql | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql index d0b559b61..6d00f9f50 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_16__add_action_initiated_by___DB2.sql @@ -1,2 +1,3 @@ -ALTER TABLE sp_action ADD COLUMN initiated_by VARCHAR(64) NOT NULL; +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/src/main/resources/db/migration/POSTGRESQL/V1_12_16__add_action_initiated_by___POSTGRESQL.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_16__add_action_initiated_by___POSTGRESQL.sql index f0d49e8c9..14a68bfd3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_16__add_action_initiated_by___POSTGRESQL.sql +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_16__add_action_initiated_by___POSTGRESQL.sql @@ -1,5 +1,7 @@ ALTER TABLE sp_action -ADD COLUMN initiated_by VARCHAR (64) NOT NULL; +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); +ADD COLUMN auto_assign_initiated_by VARCHAR (64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql index 9b4290a9d..dc6eae613 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_16__add_action_initiated_by___SQL_SERVER.sql @@ -1,2 +1,3 @@ -ALTER TABLE sp_action ADD initiated_by VARCHAR(64) NOT NULL; +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);