From 4da7f5544f00b7dde4c6ccaaa8b04b8970e48427 Mon Sep 17 00:00:00 2001 From: Sean Porth Date: Mon, 26 Sep 2022 09:28:36 -0400 Subject: [PATCH 1/2] updated pre-condition table --- backend/src/main/resources/db/changelog/changelog.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql index c98abe7f4..4ba7e8e2e 100644 --- a/backend/src/main/resources/db/changelog/changelog.sql +++ b/backend/src/main/resources/db/changelog/changelog.sql @@ -209,7 +209,7 @@ GO -- changeset liquibase:1.13.2.1 dbms:mariadb,mysql -- preconditions onFail:MARK_RAN --- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' +-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'shib_configuration_prop' -- comment: /* we don't need to run this if the system is new */ ALTER TABLE shib_configuration_prop MODIFY COLUMN description LONGTEXT; @@ -219,7 +219,7 @@ GO -- changeset liquibase:1.13.2.1 dbms:postgresql -- preconditions onFail:MARK_RAN --- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' +-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'shib_configuration_prop' -- comment: /* we don't need to run this if the system is new */ ALTER TABLE shib_configuration_prop ALTER COLUMN description TYPE TEXT; @@ -229,7 +229,7 @@ GO -- changeset liquibase:1.13.2.1 dbms:mssql -- preconditions onFail:MARK_RAN --- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' +-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'shib_configuration_prop' -- comment: /* we don't need to run this if the system is new */ ALTER TABLE shib_configuration_prop ALTER COLUMN description TEXT; From 8c45ee751809789b82a0b98b5e1b88441a87c53a Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 26 Sep 2022 13:25:54 -0700 Subject: [PATCH 2/2] SHIBUI-2404 Update to db + fix to Description class for TEXT field --- .../admin/ui/domain/Description.java | 2 ++ .../main/resources/db/changelog/changelog.sql | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java index b86c86b1d..133c81ff5 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java @@ -1,6 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui.domain; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.Type; import org.hibernate.envers.Audited; import javax.annotation.Nullable; @@ -18,6 +19,7 @@ public class Description extends AbstractXMLObject implements org.opensaml.saml. @Column(name = "descriptionValue") @Lob + @Type(type = "org.hibernate.type.TextType") private String value; @Nullable diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql index 4ba7e8e2e..d206d4bcb 100644 --- a/backend/src/main/resources/db/changelog/changelog.sql +++ b/backend/src/main/resources/db/changelog/changelog.sql @@ -235,4 +235,24 @@ GO ALTER TABLE shib_configuration_prop ALTER COLUMN description TEXT; GO ALTER TABLE shib_configuration_prop_aud ALTER COLUMN description TEXT; +GO + +-- changeset liquibase:1.13.3.1 dbms:postgresql +-- preconditions onFail:MARK_RAN +-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' +-- comment: /* we don't need to run this if the system is new */ + +ALTER TABLE description ALTER COLUMN description_value TYPE TEXT; +GO +ALTER TABLE description_aud ALTER COLUMN description_value TYPE TEXT; +GO + +-- changeset liquibase:1.13.3.1 dbms:mssql +-- preconditions onFail:MARK_RAN +-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' +-- comment: /* we don't need to run this if the system is new */ + +ALTER TABLE description ALTER COLUMN description_value TEXT; +GO +ALTER TABLE description_aud ALTER COLUMN description_value TEXT; GO \ No newline at end of file