#322 - RawSql fetch object with inheritance

src/test/java/com/avaje/ebean/BaseTestCase.java

@@ -10,7 +10,7 @@ public class BaseTestCase {
   
   static {
     logger.debug("... preStart");
-    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent","debug=1;packages=com.avaje.tests.**")) {
+    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent","debug=1;packages=com.avaje.tests.**,org.avaje.test.**")) {
       logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
     }    
   }

src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java

@@ -0,0 +1,44 @@
+package com.avaje.tests.rawsql.inherit;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import org.avaje.test.model.rawsql.inherit.ChildA;
+import org.avaje.test.model.rawsql.inherit.ChildB;
+import org.avaje.test.model.rawsql.inherit.Data;
+import org.avaje.test.model.rawsql.inherit.Parent;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class ParentQueryTest extends BaseTestCase {
+
+  @Test
+  public void QueryParentCollectionFetch() {
+
+    List<Data> exampleData = new ArrayList<Data>();
+    exampleData.add(new Data(0));
+    exampleData.add(new Data(1));
+    exampleData.add(new Data(2));
+
+    ChildA a = new ChildA(0);
+    a.setData(exampleData);
+    Ebean.save(a);
+
+    ChildB b = new ChildB(1);
+    b.setData(exampleData);
+    Ebean.save(b);
+
+    ChildA c = new ChildA(2);
+    c.setData(exampleData);
+    Ebean.save(c);
+
+    List<Parent> partial = Ebean.find(Parent.class).where().ge("number", 1).findList();
+    assertNotNull(partial.get(0).getData());
+    assertEquals(partial.get(0).getData().get(0).getNumber().intValue(), 0);
+  }
+
+}

src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java

@@ -0,0 +1,155 @@
+package com.avaje.tests.rawsql.inherit;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.FetchConfig;
+import com.avaje.ebean.RawSql;
+import com.avaje.ebean.RawSqlBuilder;
+import org.avaje.test.model.rawsql.inherit.ChildA;
+import org.avaje.test.model.rawsql.inherit.ChildB;
+import org.avaje.test.model.rawsql.inherit.Data;
+import org.avaje.test.model.rawsql.inherit.Parent;
+import org.avaje.test.model.rawsql.inherit.ParentAggregate;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class ParentRawSqlTest extends BaseTestCase {
+
+  @Test
+  public void RawSqlParentLoad() {
+
+    List<Data> exampleData = new ArrayList<Data>();
+    exampleData.add(new Data(0));
+    exampleData.add(new Data(1));
+    exampleData.add(new Data(2));
+
+    ChildA a = new ChildA(0);
+    a.setData(exampleData);
+    Ebean.save(a);
+
+    ChildB b = new ChildB(1);
+    b.setData(exampleData);
+    Ebean.save(b);
+
+    ChildA c = new ChildA(2);
+    c.setData(exampleData);
+    Ebean.save(c);
+
+    RawSql rawSql = RawSqlBuilder
+        .parse("select type, id, number from rawinherit_parent where number > 1")
+        .create();
+
+    List<Parent> partial = Ebean.find(Parent.class)
+        .setRawSql(rawSql)
+        .findList();
+
+    assertNotNull(partial.get(0).getData());
+    assertEquals(partial.get(0).getData().get(0).getNumber().intValue(), 0);
+  }
+
+  @Test
+  public void RawSqlParentFetch() {
+
+    List<Data> exampleData = new ArrayList<Data>();
+    exampleData.add(new Data(0));
+    exampleData.add(new Data(1));
+    exampleData.add(new Data(2));
+
+    ChildA a = new ChildA(0);
+    a.setData(exampleData);
+    Ebean.save(a);
+
+    ChildB b = new ChildB(1);
+    b.setData(exampleData);
+    Ebean.save(b);
+
+    ChildA c = new ChildA(2);
+    c.setData(exampleData);
+    Ebean.save(c);
+
+    useColumnMappingIgnore();
+
+    useColumnMappingWithDiscriminator();
+
+    useExtraColumnMappingIgnore();
+  }
+
+  /**
+   * Map the discriminator column - columnMapping("type", "parent.type").
+   */
+  private void useColumnMappingWithDiscriminator() {
+
+    RawSql rawSql = RawSqlBuilder
+        .unparsed("select type, id from rawinherit_parent where number > 1")
+        .columnMapping("type", "parent.type") // can map the discriminator column 'type'
+        .columnMapping("id", "parent.id")
+        .create();
+
+    List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
+        .fetch("parent", new FetchConfig().query())
+        .findList();
+
+    List<Parent> partial = new ArrayList<Parent>();
+    for (ParentAggregate aggregate : aggregates) {
+      partial.add(aggregate.parent);
+    }
+
+    assertNotNull(partial.get(0).getData());
+    assertEquals(partial.get(0).getData().get(0).getNumber().intValue(), 0);
+  }
+
+  /**
+   * Use columnMappingIgnore() to ignore the discriminator column.
+   */
+  private void useColumnMappingIgnore() {
+
+    RawSql rawSql = RawSqlBuilder
+        .unparsed("select type, id from rawinherit_parent where number > 1")
+        .columnMappingIgnore("type") // can ignore the discriminator 'type'
+        .columnMapping("id", "parent.id")
+        .create();
+
+    List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
+        .fetch("parent", new FetchConfig().query())
+        .findList();
+
+    List<Parent> partial = new ArrayList<Parent>();
+    for (ParentAggregate aggregate : aggregates) {
+      partial.add(aggregate.parent);
+    }
+
+    assertNotNull(partial.get(0).getData());
+    assertEquals(partial.get(0).getData().get(0).getNumber().intValue(), 0);
+  }
+
+  /**
+   * Extra columnMappingIgnore() before and after.
+   */
+  private void useExtraColumnMappingIgnore() {
+
+    RawSql rawSql = RawSqlBuilder
+        .unparsed("select 'a', type, id, 'b' from rawinherit_parent where number > 1")
+        .columnMappingIgnore("a") // extra ignore before
+        .columnMappingIgnore("type")
+        .columnMapping("id", "parent.id")
+        .columnMappingIgnore("b") // extra ignore after
+        .create();
+
+    List<ParentAggregate> aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql)
+        .fetch("parent", new FetchConfig().query())
+        .findList();
+
+    List<Parent> partial = new ArrayList<Parent>();
+    for (ParentAggregate aggregate : aggregates) {
+      partial.add(aggregate.parent);
+    }
+    assertNotNull(partial.get(0).getData());
+    assertEquals(partial.get(0).getData().get(0).getNumber().intValue(), 0);
+  }
+
+}

src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java

@@ -0,0 +1,18 @@
+package org.avaje.test.model.rawsql.inherit;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue("A")
+public class ChildA extends Parent {
+
+    public String getName() {
+        return "A Name";
+    }
+
+    public ChildA(Integer number) {
+        super(number);
+    }
+
+}

src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java

@@ -0,0 +1,17 @@
+package org.avaje.test.model.rawsql.inherit;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue("B")
+public class ChildB extends Parent {
+
+    public String getName() {
+        return "B Name";
+    }
+
+    public ChildB(Integer number) {
+        super(number);
+    }
+}

src/test/java/org/avaje/test/model/rawsql/inherit/Data.java

@@ -0,0 +1,34 @@
+package org.avaje.test.model.rawsql.inherit;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "rawinherit_data")
+public class Data {
+
+    @Id
+    private Long id;
+
+    private Integer number;
+
+    @ManyToMany(mappedBy = "data")
+    public List<Parent> parents = new ArrayList<Parent>();
+
+    public Data(int number) {
+        this.number = number;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+}

src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java

@@ -0,0 +1,50 @@
+package org.avaje.test.model.rawsql.inherit;
+
+import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "rawinherit_parent")
+@Inheritance(strategy= InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(name="type")
+public abstract class Parent {
+
+    @Id
+    private Long id;
+
+    private Integer number;
+
+    @ManyToMany(cascade = CascadeType.PERSIST)
+    private List<Data> data = new ArrayList<Data>();
+
+    protected Parent(Integer number) {
+        this.number = number;
+    }
+
+    public abstract String getName();
+
+    public Long getId() {
+        return id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public List<Data> getData() {
+        return data;
+    }
+
+    public void setData(List<Data> datas) {
+        this.data = datas;
+    }
+
+}

src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java

@@ -0,0 +1,15 @@
+package org.avaje.test.model.rawsql.inherit;
+
+import com.avaje.ebean.annotation.Sql;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Entity
+@Sql
+public class ParentAggregate {
+
+    @OneToOne
+    public Parent parent;
+
+}