From 03386dbb95c7092a3051ff8b29058eb31a94db20 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 20 Oct 2011 16:29:27 -0700 Subject: [PATCH] Catch non-primary-key uniqueness violations as well. --- src/main/java/com/samskivert/jdbc/HsqldbLiaison.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java b/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java index 3ab6cf57..38c5b0fe 100644 --- a/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java +++ b/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java @@ -102,8 +102,10 @@ public class HsqldbLiaison extends BaseLiaison public boolean isDuplicateRowException (SQLException sqe) { // Violation of unique constraint SYS_PK_51: duplicate value(s) for column(s) FOO + // integrity constraint violation: unique constraint or index violation; SYS_CT_10057 String msg = sqe.getMessage(); - return (msg != null && msg.indexOf("duplicate value(s)") != -1); + return (msg != null && (msg.contains("duplicate value(s)") || + msg.contains("unique constraint or index violation"))); } // BaseLiaison's implementation of table creation accepts unique constraints both as