From 489bd77dd4c180faeedb0ad5296fb62720e1ee9b Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Mon, 6 Jul 2020 14:56:36 -0400 Subject: [PATCH] Make constraint name comparisons case insensitive --- .../fhir/jpa/config/HapiFhirHibernateJpaDialect.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java index 1c2695f32da..1a8fb937b5f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java @@ -70,14 +70,19 @@ public class HapiFhirHibernateJpaDialect extends HibernateJpaDialect { if (theException instanceof ConstraintViolationException) { String constraintName = ((ConstraintViolationException) theException).getConstraintName(); + + /* + * Note: Compare the constraint name in a case-insensitive way. Most DBs preserve the case, but Postgresql + * will return it as lowercase even though the definition is in caps. + */ if (isNotBlank(constraintName)) { - if (constraintName.contains(ResourceHistoryTable.IDX_RESVER_ID_VER)) { + if (constraintName.toUpperCase().contains(ResourceHistoryTable.IDX_RESVER_ID_VER)) { throw new ResourceVersionConflictException(messageToPrepend + myLocalizer.getMessage(HapiFhirHibernateJpaDialect.class, "resourceVersionConstraintFailure")); } - if (constraintName.contains(ResourceIndexedCompositeStringUnique.IDX_IDXCMPSTRUNIQ_STRING)) { + if (constraintName.toUpperCase().contains(ResourceIndexedCompositeStringUnique.IDX_IDXCMPSTRUNIQ_STRING)) { throw new ResourceVersionConflictException(messageToPrepend + myLocalizer.getMessage(HapiFhirHibernateJpaDialect.class, "resourceIndexedCompositeStringUniqueConstraintFailure")); } - if (constraintName.contains(ForcedId.IDX_FORCEDID_TYPE_FID)) { + if (constraintName.toUpperCase().contains(ForcedId.IDX_FORCEDID_TYPE_FID)) { throw new ResourceVersionConflictException(messageToPrepend + myLocalizer.getMessage(HapiFhirHibernateJpaDialect.class, "forcedIdConstraintFailure")); } }