From 18961047a182659a3135913115841428d8e87d9f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 31 Mar 2014 22:49:44 +1300 Subject: [PATCH] Fix for #80 - Exposing discriminator value in entity bean throws exception when updating or deleting --- .../dmlbind/FactoryBaseProperties.java | 4 ++ .../model/inheritexposedtype/IXPhoto.java | 10 ++++ .../model/inheritexposedtype/IXResource.java | 46 +++++++++++++++++++ .../test/TestInheritExposeDtype.java | 26 +++++++++++ 4 files changed, 86 insertions(+) create mode 100644 src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java create mode 100644 src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java create mode 100644 src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java index d24a30957..cae47800c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java @@ -47,12 +47,16 @@ public class FactoryBaseProperties { for (int i = 0; i < props.length; i++) { + if(DmlMode.WHERE.equals(mode) && !withLobs && !props[i].isDbUpdatable()) { + // skip non-updatable column from where clause + } else { Bindable item = factoryProperty.create(props[i], mode, withLobs); if (item != null) { list.add(item); } else { // null where readOnly (Secondary tables) or Lob exclusion } + } } } diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java new file mode 100644 index 000000000..8d7a711e3 --- /dev/null +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java @@ -0,0 +1,10 @@ +package com.avaje.tests.model.inheritexposedtype; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +@Entity +@DiscriminatorValue( "photo" ) +public class IXPhoto extends IXResource { + +} diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java new file mode 100644 index 000000000..06f50f6d4 --- /dev/null +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java @@ -0,0 +1,46 @@ +package com.avaje.tests.model.inheritexposedtype; + +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; + +@Entity +@Inheritance(strategy=InheritanceType.SINGLE_TABLE) +public class IXResource { + + @Id + UUID id; + + @Column(insertable=false, updatable=false) + String dtype; + + String name; + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getDtype() { + return dtype; + } + + public void setDtype(String dtype) { + this.dtype = dtype; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java new file mode 100644 index 000000000..284ba6a33 --- /dev/null +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -0,0 +1,26 @@ +package com.avaje.tests.model.inheritexposedtype.test; + +import org.junit.Test; + +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.model.inheritexposedtype.IXPhoto; + +public class TestInheritExposeDtype extends BaseTestCase { + + @Test + public void test() { + + IXPhoto p = new IXPhoto(); + p.setName("the name"); + Ebean.save(p); + + // update + p.setName("new name"); + Ebean.save(p); + + // delete + Ebean.delete(p); + + } +}