From 56562915bf4a42652952c96470e3d20ff0e12f66 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 14 Jan 2020 16:20:02 +1300 Subject: [PATCH] #1912 - Allow @Index(unique=true) to support formula in columns --- src/main/java/io/ebeaninternal/dbmigration/model/MTable.java | 5 +---- src/test/java/org/tests/model/basic/TSDetail.java | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 3776c73ed..354f1824f 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -765,10 +765,7 @@ public class MTable { List nullableColumns = new ArrayList<>(); for (String columnName : uniq.getColumns()) { MColumn col = getColumn(columnName); - if (col == null) { - throw new IllegalStateException("Column '" + columnName + "' not found in table " + getName()); - } - if (!col.isNotnull()) { + if (col != null && !col.isNotnull()) { nullableColumns.add(columnName); } } diff --git a/src/test/java/org/tests/model/basic/TSDetail.java b/src/test/java/org/tests/model/basic/TSDetail.java index cca4584cc..0d9de6d1b 100644 --- a/src/test/java/org/tests/model/basic/TSDetail.java +++ b/src/test/java/org/tests/model/basic/TSDetail.java @@ -13,6 +13,7 @@ import javax.validation.constraints.Size; /** * A basic entity to test simple things. */ +//@Index(name = "t_detail_foo_name", unique = true, columnNames = "lower(name)") @Entity @Table(name = "t_detail_with_other_namexxxyy") public class TSDetail {