Merged in bugfix/shibui-2404 (pull request #619)

race condition between changelog and ShibPropertiesBootstrap Approved-by: Dmitriy Kopylenko Approved-by: Charles Hasegawa
TIER · Sep 26, 2022 · e0f1808 · e0f1808
2 parents d4589af + 8c45ee7
commit e0f1808
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
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
@@ -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
@@ -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,10 +229,30 @@ 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;
 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