From 0a8052020b1155ddf862615a8c33e48faf00d351 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 19 Sep 2022 11:57:47 -0700 Subject: [PATCH 1/8] [Gradle Release Plugin] - pre tag commit: '1.13.1'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8287440e0..46c68393d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.14.0-SNAPSHOT +version=1.13.1 ### library versions ### commonsCollections4Version=4.4 From db9fcbd699548589d017d6121e636d62ffe47e6c Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 19 Sep 2022 11:59:41 -0700 Subject: [PATCH 2/8] [Gradle Release Plugin] - new version commit: '1.14.0-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 46c68393d..8287440e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.13.1 +version=1.14.0-SNAPSHOT ### library versions ### commonsCollections4Version=4.4 From b4c9da50b59b7d89c6ebb2920e6eba28711f17a0 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 20 Sep 2022 12:44:08 -0700 Subject: [PATCH 3/8] SHIBUI-2397 Change to shib config table - making description a lob --- .../properties/ShibConfigurationProperty.java | 4 +++ .../main/resources/db/changelog/changelog.sql | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java index 69e860302..39a964e86 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java @@ -3,12 +3,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import edu.internet2.tier.shibboleth.admin.util.EmptyStringToNullConverter; import lombok.Data; +import org.hibernate.annotations.Type; import org.hibernate.envers.Audited; import javax.persistence.Column; import javax.persistence.Convert; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Lob; import java.util.UUID; @Entity(name = "shib_configuration_prop") @@ -30,6 +32,8 @@ public class ShibConfigurationProperty { String defaultValue; @Column(name = "description") + @Lob + @Type(type = "org.hibernate.type.TextType") @Convert(converter = EmptyStringToNullConverter.class) String description; diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql index c213f3952..c98abe7f4 100644 --- a/backend/src/main/resources/db/changelog/changelog.sql +++ b/backend/src/main/resources/db/changelog/changelog.sql @@ -206,3 +206,33 @@ ALTER TABLE description ALTER COLUMN description_value TEXT; GO ALTER TABLE description_aud ALTER COLUMN description_value TEXT; 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' +-- comment: /* we don't need to run this if the system is new */ + +ALTER TABLE shib_configuration_prop MODIFY COLUMN description LONGTEXT; +GO +ALTER TABLE shib_configuration_prop_aud MODIFY COLUMN description LONGTEXT; +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' +-- comment: /* we don't need to run this if the system is new */ + +ALTER TABLE shib_configuration_prop ALTER COLUMN description TYPE TEXT; +GO +ALTER TABLE shib_configuration_prop_aud ALTER COLUMN description TYPE TEXT; +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' +-- comment: /* we don't need to run this if the system is new */ + +ALTER TABLE shib_configuration_prop ALTER COLUMN description TEXT; +GO +ALTER TABLE shib_configuration_prop_aud ALTER COLUMN description TEXT; +GO \ No newline at end of file From fab1a8801eff07f3cbb4953c329dc1baf9ed34b3 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 20 Sep 2022 13:01:55 -0700 Subject: [PATCH 4/8] SHIBUI-2397 Fixing entity --- .../ui/domain/shib/properties/ShibConfigurationProperty.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java index 39a964e86..0c02facbf 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/shib/properties/ShibConfigurationProperty.java @@ -31,10 +31,9 @@ public class ShibConfigurationProperty { @Convert(converter = EmptyStringToNullConverter.class) String defaultValue; - @Column(name = "description") @Lob @Type(type = "org.hibernate.type.TextType") - @Convert(converter = EmptyStringToNullConverter.class) + @Convert(converter = EmptyStringToNullConverter.class, disableConversion = true) String description; @Column(name = "idp_version", nullable = false) From 966fa7928727987a1fd81aeee5fb78e14b509544 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 20 Sep 2022 13:26:11 -0700 Subject: [PATCH 5/8] [Gradle Release Plugin] - pre tag commit: '1.13.2'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8287440e0..bd69ccabe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.14.0-SNAPSHOT +version=1.13.2 ### library versions ### commonsCollections4Version=4.4 From d4589af2d79c5da82e78316eeed03e27cb23bb99 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 20 Sep 2022 13:26:54 -0700 Subject: [PATCH 6/8] [Gradle Release Plugin] - new version commit: '1.14.0-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bd69ccabe..8287440e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.13.2 +version=1.14.0-SNAPSHOT ### library versions ### commonsCollections4Version=4.4 From 4da7f5544f00b7dde4c6ccaaa8b04b8970e48427 Mon Sep 17 00:00:00 2001 From: Sean Porth Date: Mon, 26 Sep 2022 09:28:36 -0400 Subject: [PATCH 7/8] 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 8/8] 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