#1142 - Mapping - Add support for @OrderColumn (Ebean automatically maintains an order column)

src/test/java/org/tests/cascade/OmOrderedDetail.java

@@ -0,0 +1,57 @@
+package org.tests.cascade;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class OmOrderedDetail {
+
+  @Id
+  Long id;
+
+  String name;
+
+  @ManyToOne
+  OmOrderedMaster master;
+
+  @Version
+  Long version;
+
+  public OmOrderedDetail(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public OmOrderedMaster getMaster() {
+    return master;
+  }
+
+  public void setMaster(OmOrderedMaster master) {
+    this.master = master;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}

src/test/java/org/tests/cascade/OmOrderedMaster.java

@@ -0,0 +1,63 @@
+package org.tests.cascade;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Version;
+import java.util.List;
+
+@Entity
+public class OmOrderedMaster {
+
+  @Id
+  Long id;
+
+  String name;
+
+  /**
+   * Cascade ALL set automatically as we set order values when cascading.
+   */
+  @OneToMany(mappedBy = "master") //, cascade = CascadeType.ALL)
+  @OrderColumn(name="sort_order")
+  List<OmOrderedDetail> details;
+
+  @Version
+  Long version;
+
+  public OmOrderedMaster(String name) {
+    this.name = name;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<OmOrderedDetail> getDetails() {
+    return details;
+  }
+
+  public void setDetails(List<OmOrderedDetail> details) {
+    this.details = details;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+}

src/test/java/org/tests/cascade/TestOrderedList.java

@@ -0,0 +1,98 @@
+package org.tests.cascade;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestOrderedList extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    OmOrderedMaster master = new OmOrderedMaster("m1");
+
+    List<OmOrderedDetail> details = master.getDetails();
+    for (int i = 0; i < 5; i++) {
+      details.add(new OmOrderedDetail("d"+i));
+    }
+
+    LoggedSqlCollector.start();
+    Ebean.save(master);
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.size()).isGreaterThan(1);
+    assertThat(sql.get(0)).contains("insert into om_ordered_master");
+    assertThat(sql.get(1)).contains("insert into om_ordered_detail (name, version, sort_order, master_id) values (?,?,?,?)");
+
+    // update without any changes
+    Ebean.save(master);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+
+    // update just changing master
+    master.setName("m1-mod");
+    Ebean.save(master);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+
+
+    fetchAndReorder(master.getId());
+
+  }
+
+  private void fetchAndReorder(Long id) {
+
+    OmOrderedMaster fresh = Ebean.find(OmOrderedMaster.class).setId(id).fetch("details").findOne();
+    List<OmOrderedDetail> details1 = fresh.getDetails();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql.get(0)).contains("order by t0.id, t1.sort_order");
+
+    // fetched, not dirty
+    Ebean.save(fresh);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+
+    // reorder
+    OmOrderedDetail third = details1.remove(2);
+    OmOrderedDetail first = details1.remove(0);
+    details1.add(first);
+    details1.add(third);
+
+    fresh.setName("m1-reorder");
+
+    Ebean.save(fresh);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(6);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+    assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
+
+    details1.get(1).setName("was 1");
+    fresh.setName("m1-mod3");
+    Ebean.save(fresh);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(6);
+    assertThat(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
+    assertThat(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
+    assertThat(sql.get(2)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
+
+
+    Ebean.delete(fresh);
+
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(2);
+    assertThat(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?");
+    assertThat(sql.get(1)).contains("delete from om_ordered_master where id=? and version=?");
+  }
+}