github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#527 - @OrderBy on child-of-child property

Browse Source
This commit is contained in:
Robin Bygrave
2016-01-13 11:37:38 +13:00
parent 0453892ebd
commit b04419d9c7
7 changed files with 147 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java
+39 -4
View File
@@ -2,6 +2,8 @@ package com.avaje.tests.inheritance;
import java.util.List;
import com.avaje.tests.model.basic.CarAccessory;
import com.avaje.tests.model.basic.CarFuse;
import org.junit.Assert;
import org.junit.Test;
@@ -13,6 +15,9 @@ import com.avaje.tests.model.basic.Truck;
import com.avaje.tests.model.basic.Vehicle;
import com.avaje.tests.model.basic.VehicleDriver;
import static org.assertj.core.api.StrictAssertions.assertThat;
import static org.junit.Assert.assertNotNull;
public class TestInheritInsert extends BaseTestCase {
@Test
@@ -27,7 +32,7 @@ public class TestInheritInsert extends BaseTestCase {
Truck t0 = (Truck) v;
Assert.assertEquals(Double.valueOf(10d), t0.getCapacity());
Assert.assertEquals(Double.valueOf(10d), ((Truck) v).getCapacity());
Assert.assertNotNull(t0.getId());
assertNotNull(t0.getId());
} else {
Assert.assertTrue("v not a Truck?", false);
}
@@ -43,7 +48,7 @@ public class TestInheritInsert extends BaseTestCase {
if (v instanceof Truck) {
Double capacity = ((Truck) v).getCapacity();
Assert.assertEquals(Double.valueOf(10d), capacity);
Assert.assertNotNull(v.getId());
assertNotNull(v.getId());
} else {
Assert.assertTrue("v not a Truck?", false);
}
@@ -73,9 +78,9 @@ public class TestInheritInsert extends BaseTestCase {
query.where().eq("vehicle.licenseNumber", "MARIOS_CAR_LICENSE");
List<VehicleDriver> drivers = query.findList();
Assert.assertNotNull(drivers);
assertNotNull(drivers);
Assert.assertEquals(1, drivers.size());
Assert.assertNotNull(drivers.get(0));
assertNotNull(drivers.get(0));
Assert.assertEquals("Mario", drivers.get(0).getName());
Assert.assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle().getLicenseNumber());
@@ -86,4 +91,34 @@ public class TestInheritInsert extends BaseTestCase {
Ebean.save(car);
}
@Test
public void test_AtOrderBy_on_ChildOfChild() {
Car car = new Car();
car.setLicenseNumber("ABC");
Ebean.save(car);
CarFuse fuse = new CarFuse();
fuse.setLocationCode("xdfg");
Ebean.save(fuse);
CarAccessory accessory = new CarAccessory(car, fuse);
Ebean.save(accessory);
Query<Car> query = Ebean.find(Car.class)
.fetch("accessories")
.where()
.eq("id", car.getId())
.query();
Car result = query.findUnique();
assertThat(query.getGeneratedSql()).contains("order by t0.id, t2.location_code");
assertThat(query.getGeneratedSql()).contains("left outer join car_fuse t2 on t2.id = t1.fuse_id");
assertNotNull(result);
}
}
src/test/java/com/avaje/tests/model/basic/Car.java
+30 -30
View File
@@ -1,51 +1,51 @@
package com.avaje.tests.model.basic;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import java.util.HashSet;
import java.util.Set;
@Entity
@Inheritance
@DiscriminatorValue("C")
public class Car extends Vehicle {
private static final long serialVersionUID = 4716705779684333446L;
private static final long serialVersionUID = 4716705779684333446L;
private String driver;
private String driver;
@ManyToOne
TruckRef carRef;
@OneToMany(mappedBy="car")
private Set<CarAccessory> accessories = new HashSet<CarAccessory>();
public String getDriver() {
return driver;
}
@ManyToOne
TruckRef carRef;
public void setDriver(String driver) {
this.driver = driver;
}
@OneToMany(mappedBy = "car")
@OrderBy("fuse.locationCode")
private Set<CarAccessory> accessories = new HashSet<CarAccessory>();
public TruckRef getCarRef() {
return carRef;
}
public String getDriver() {
return driver;
}
public void setCarRef(TruckRef carRef) {
this.carRef = carRef;
}
public void setDriver(String driver) {
this.driver = driver;
}
public Set<CarAccessory> getAccessories() {
return accessories;
}
public TruckRef getCarRef() {
return carRef;
}
public void setAccessories(Set<CarAccessory> accessories) {
this.accessories = accessories;
}
public void setCarRef(TruckRef carRef) {
this.carRef = carRef;
}
public Set<CarAccessory> getAccessories() {
return accessories;
}
public void setAccessories(Set<CarAccessory> accessories) {
this.accessories = accessories;
}
}
src/test/java/com/avaje/tests/model/basic/CarAccessory.java
+35 -19
View File
@@ -4,28 +4,44 @@ import javax.persistence.Entity;
import javax.persistence.ManyToOne;
@Entity
public class CarAccessory extends BasicDomain{
private static final long serialVersionUID = 1L;
public class CarAccessory extends BasicDomain {
private String name;
@ManyToOne
private Car car;
private static final long serialVersionUID = 1L;
public String getName() {
return name;
}
private String name;
public void setName(String name) {
this.name = name;
}
@ManyToOne(optional = false)
private CarFuse fuse;
public Car getCar() {
return car;
}
@ManyToOne
private Car car;
public void setCar(Car car) {
this.car = car;
}
public CarAccessory(Car car, CarFuse fuse) {
this.car = car;
this.fuse = fuse;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Car getCar() {
return car;
}
public void setCar(Car car) {
this.car = car;
}
public CarFuse getFuse() {
return fuse;
}
public void setFuse(CarFuse fuse) {
this.fuse = fuse;
}
}
src/test/java/com/avaje/tests/model/basic/CarFuse.java
+29
View File
@@ -0,0 +1,29 @@
package com.avaje.tests.model.basic;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
public class CarFuse {
@Id
Long id;
String locationCode;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getLocationCode() {
return locationCode;
}
public void setLocationCode(String locationCode) {
this.locationCode = locationCode;
}
}
src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java
+4
View File
@@ -3,6 +3,8 @@ package com.avaje.tests.text.json;
import java.io.IOException;
import java.util.List;
import com.avaje.tests.model.basic.CarAccessory;
import com.avaje.tests.model.basic.CarFuse;
import org.junit.Assert;
import org.junit.Test;
@@ -38,6 +40,8 @@ public class TestTextJsonInheritance extends BaseTestCase {
private void setupData() {
Ebean.createUpdate(CarAccessory.class, "delete from CarAccessory").execute();
Ebean.createUpdate(CarFuse.class, "delete from CarFuse").execute();
Ebean.createUpdate(Trip.class, "delete from trip").execute();
Ebean.createUpdate(VehicleDriver.class, "delete from vehicleDriver").execute();
Ebean.createUpdate(Vehicle.class, "delete from vehicle").execute();