diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index 897c4dedc..64a80db4a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -107,7 +107,7 @@ public class ImportedIdEmbedded implements ImportedId { if (embeddedId == null){ for (int i = 0; i < imported.length; i++) { if (imported[i].owner.isUpdateable()) { - request.bind(null, imported[i].foreignProperty, imported[i].localDbColumn); + request.bind(null, imported[i].foreignProperty); } } @@ -116,7 +116,7 @@ public class ImportedIdEmbedded implements ImportedId { for (int i = 0; i < imported.length; i++) { if (imported[i].owner.isUpdateable()) { Object scalarValue = imported[i].foreignProperty.getValue(embedded); - request.bind(scalarValue, imported[i].foreignProperty, imported[i].localDbColumn); + request.bind(scalarValue, imported[i].foreignProperty); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java index 78c8ef4f2..a741a490c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdMultiple.java @@ -77,7 +77,7 @@ public class ImportedIdMultiple implements ImportedId { for (int i = 0; i < imported.length; i++) { if (imported[i].owner.isUpdateable()) { Object scalarValue = imported[i].foreignProperty.getValue(bean); - request.bind(scalarValue, imported[i].foreignProperty, imported[i].localDbColumn); + request.bind(scalarValue, imported[i].foreignProperty); } } // hmmm, not worrying about this just yet diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 9fe3dfcab..272279b35 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -135,7 +135,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable */ - public Object bind(Object value, BeanProperty prop, String propName) throws SQLException; + public Object bind(Object value, BeanProperty prop) throws SQLException; /** * Bind a raw value. Used to bind the discriminator column. @@ -42,7 +42,7 @@ public interface BindableRequest { /** * Bind the value to the preparedStatement without logging. */ - public Object bindNoLog(Object value, BeanProperty prop, String propName) throws SQLException; + public Object bindNoLog(Object value, BeanProperty prop) throws SQLException; /** diff --git a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java index 2267f3bca..17a218c2e 100644 --- a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java +++ b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java @@ -1,5 +1,6 @@ package com.avaje.tests.model.types; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; @@ -14,12 +15,16 @@ public class SomeNewTypesBean { @Version Long version; + @Column(name = "dow") DayOfWeek dayOfWeek; + @Column(name = "mth") Month month; + @Column(name = "yr") Year year; + @Column(name = "yr_mth") YearMonth yearMonth; LocalDate localDate;