diff --git a/ebean-ddl-generator/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-ddl-generator/src/test/java/misc/migration/history/v1_0/EHistory7.java deleted file mode 100644 index 28ca8c5de..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ /dev/null @@ -1,24 +0,0 @@ -package misc.migration.history.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - -/** - * detects a bug where dropHistoryTable is not applied correctly - * - * @author Roland Praml, FOCONIS AG - * - */ -@Entity -@Table(name = "migtest_e_history7") -@History -public class EHistory7 { - - @Id - Integer id; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-ddl-generator/src/test/java/misc/migration/history/v1_1/EHistory7.java deleted file mode 100644 index 7b658368c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/history/v1_1/EHistory7.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.history.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * detects a bug where dropHistoryTable is not applied correctly - * - * @author Roland Praml, FOCONIS AG - * - */ -@Entity -@Table(name = "migtest_e_history7") -public class EHistory7 { - - @Id - Integer id; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_0/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_0/EBasic.java deleted file mode 100644 index b11fb4a8c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_0/EBasic.java +++ /dev/null @@ -1,89 +0,0 @@ -package misc.migration.mysql_v1_0; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.NotNull; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -@Entity -@Table(name = "migtest_e_basic") -public class EBasic { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status status; - - @DbDefault("N") - @NotNull - Status status2; - - @Size(max=127) - String name; - - @Size(max=127) - String description; - - public EBasic() { - - } - - public EBasic(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Status getStatus2() { - return status2; - } - - public void setStatus2(final Status status2) { - this.status2 = status2; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_1/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_1/EBasic.java deleted file mode 100644 index 739332226..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_1/EBasic.java +++ /dev/null @@ -1,64 +0,0 @@ -package misc.migration.mysql_v1_1; - -import io.ebean.annotation.EnumValue; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -@Entity -@Table(name = "migtest_e_basic") -public class EBasic { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status status; - - @Size(max=127) - String name; - - public EBasic() { - - } - - public EBasic(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyAssoc.java deleted file mode 100644 index 75f0c7013..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyAssoc.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_assoc") -public class CKeyAssoc { - - @Id - Integer id; - - String assocOne; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getAssocOne() { - return assocOne; - } - - public void setAssocOne(String assocOne) { - this.assocOne = assocOne; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyDetail.java deleted file mode 100644 index 2d8c7f956..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyDetail.java +++ /dev/null @@ -1,41 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_detail") -public class CKeyDetail { - - @Id - Integer id; - - String something; - - - public CKeyDetail() { - - } - - public CKeyDetail(String something) { - this.something = something; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getSomething() { - return something; - } - - public void setSomething(String something) { - this.something = something; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParent.java deleted file mode 100644 index dacf6febe..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParent.java +++ /dev/null @@ -1,44 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; - -@Entity -@Table(name = "migtest_ckey_parent") -public class CKeyParent { - - @EmbeddedId - CKeyParentId id; - - String name; - - @Version - int version; - - public CKeyParentId getId() { - return id; - } - - public void setId(CKeyParentId id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParentId.java deleted file mode 100644 index d61d29e7d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParentId.java +++ /dev/null @@ -1,59 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Embeddable; -import javax.validation.constraints.Size; - -@Embeddable -public class CKeyParentId { - - Integer oneKey; - - @Size(max=127) - String twoKey; - - public CKeyParentId() { - - } - - public CKeyParentId(Integer oneKey, String twoKey) { - this.oneKey = oneKey; - this.twoKey = twoKey; - } - - public Integer getOneKey() { - return oneKey; - } - - public void setOneKey(Integer oneKey) { - this.oneKey = oneKey; - } - - public String getTwoKey() { - return twoKey; - } - - public void setTwoKey(String twoKey) { - this.twoKey = twoKey; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof CKeyParentId)) { - return false; - } - - CKeyParentId otherKey = (CKeyParentId) o; - return otherKey.hashCode() == hashCode(); - } - - @Override - public int hashCode() { - int hc = getClass().getName().hashCode(); - hc = 31 * hc + oneKey; - hc = 31 * hc + twoKey.hashCode(); - return hc; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascade.java deleted file mode 100644 index f7b14f321..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascade.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_0; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_cascade") -public class DfkCascade { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.CASCADE) - DfkCascadeOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascadeOne.java deleted file mode 100644 index 1d57570bf..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -import java.util.List; - -@Entity -@Table(name = "migtest_fk_cascade_one") -public class DfkCascadeOne { - - @Id - long id; - - @OneToMany(mappedBy = "one", cascade = CascadeType.ALL) - List details; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNone.java deleted file mode 100644 index 1c44c06d6..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNone.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_0; - -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - - -@Entity -@Table(name = "migtest_fk_none") -public class DfkNone { - - @Id - long id; - - @ManyToOne - @DbForeignKey(noConstraint = true) - DfkOne one; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java deleted file mode 100644 index c8147fdcd..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_none_via_join") -public class DfkNoneViaJoin { - - @Id - long id; - - @ManyToOne - @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkOne.java deleted file mode 100644 index 28e2da229..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkOne.java +++ /dev/null @@ -1,13 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_one") -public class DfkOne { - - @Id - long id; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkSetNull.java deleted file mode 100644 index 6c46d7529..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkSetNull.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_0; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_set_null") -public class DfkSetNull { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.SET_NULL) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EBasic.java deleted file mode 100644 index e1c16afd6..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EBasic.java +++ /dev/null @@ -1,130 +0,0 @@ -package misc.migration.v1_0; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import java.sql.Timestamp; - -@Entity -@Table(name = "migtest_e_basic") -public class EBasic { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status status; - - @DbDefault("N") - @NotNull - Status status2; - - @Size(max=127) - String name; - - @Size(max=127) - String description; - - Timestamp someDate; - - boolean old_boolean; - - Boolean old_boolean2; - - @ManyToOne - ERef eref; - - - // test add & remove indices - @Index - @Size(max=127) - String indextest1; - - @Index(unique = true) - @Size(max=127) - String indextest2; - - @Size(max=127) - String indextest3; - - @Size(max=127) - String indextest4; - - @Index(unique = false) - @Size(max=127) - String indextest5; - - @Index(unique = true) - @Size(max=127) - String indextest6; - - @NotNull - int user_id; - - public EBasic() { - - } - - public EBasic(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Timestamp getSomeDate() { - return someDate; - } - - public void setSomeDate(Timestamp someDate) { - this.someDate = someDate; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EEnum.java deleted file mode 100644 index f2db733e7..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.EnumValue; - -@Entity -@Table(name = "migtest_e_enum") -public class EEnum { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status testStatus; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory.java deleted file mode 100644 index fe0bcdfe9..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory.java +++ /dev/null @@ -1,17 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_e_history") -public class EHistory { - - @Id - Integer id; - - - String testString; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory2.java deleted file mode 100644 index d8c76df75..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory2.java +++ /dev/null @@ -1,26 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - -@Entity -@Table(name = "migtest_e_history2") -@History -public class EHistory2 { - - @Id - Integer id; - - - String testString; - - @HistoryExclude - String obsoleteString1; - - String obsoleteString2; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory3.java deleted file mode 100644 index b5e41db5d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory3.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history3") -@History -public class EHistory3 { - - @Id - Integer id; - - String testString; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory4.java deleted file mode 100644 index aba167995..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory4.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history4") -@History -public class EHistory4 { - - @Id - Integer id; - - Integer testNumber; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory5.java deleted file mode 100644 index 133a00c3d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory5.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history5") -@History -public class EHistory5 { - - @Id - Integer id; - - Integer testNumber; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory6.java deleted file mode 100644 index c95eb7796..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory6.java +++ /dev/null @@ -1,24 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - - -@Entity -@Table(name = "migtest_e_history6") -@History -public class EHistory6 { - - @Id - Integer id; - - Integer testNumber1; - - @NotNull - Integer testNumber2; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ERef.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ERef.java deleted file mode 100644 index f4cfdf875..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ERef.java +++ /dev/null @@ -1,28 +0,0 @@ -package misc.migration.v1_0; - -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; - -@Entity -@Table(name = "migtest_e_ref") -public class ERef { - - @Id - Integer id; - - @OneToMany - List basics; - - @NotNull - @Index(unique = true) - @Size(max=127) - String name; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ESoftdelete.java deleted file mode 100644 index 58d9a0af0..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ESoftdelete.java +++ /dev/null @@ -1,17 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_e_softdelete") -public class ESoftdelete { - - @Id - Integer id; - - - String testString; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmChild.java deleted file mode 100644 index c0f9f5918..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmChild.java +++ /dev/null @@ -1,34 +0,0 @@ -package misc.migration.v1_0; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_c") -public class MtmChild { - - @Id - Integer id; - - String name; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmMaster.java deleted file mode 100644 index 87b23387c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmMaster.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_m") -public class MtmMaster { - - @Id - Long id; - - String 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; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoChild.java deleted file mode 100644 index 23bc8f569..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoChild.java +++ /dev/null @@ -1,39 +0,0 @@ -package misc.migration.v1_0; - -import io.ebean.annotation.Index; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import static io.ebean.annotation.Platform.POSTGRES; - -@Index(platforms = POSTGRES, name = "idxd_migtest_0", definition = "create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM'") -@Index(platforms = POSTGRES, columnNames = {"lower(name)","id"}, concurrent = true) -@Index(platforms = POSTGRES, columnNames = "lower(name)") -@Entity -@Table(name = "migtest_oto_child") -public class OtoChild { - - @Id - Integer id; - - String name; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoMaster.java deleted file mode 100644 index 770c3e754..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoMaster.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_0; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_oto_master") -public class OtoMaster { - - @Id - Long id; - - String 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; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyAssoc.java deleted file mode 100644 index 847ddc32c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyAssoc.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_assoc") -public class CKeyAssoc { - - @Id - Integer id; - - String assocOne; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getAssocOne() { - return assocOne; - } - - public void setAssocOne(String assocOne) { - this.assocOne = assocOne; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyDetail.java deleted file mode 100644 index 2b8655c0b..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyDetail.java +++ /dev/null @@ -1,57 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_detail") -public class CKeyDetail { - - @Id - Integer id; - - String something; - - @ManyToOne -// @JoinColumns({ -// @JoinColumn(name="parent_one_key", referencedColumnName="one_key"), -// @JoinColumn(name="parent_two_key", referencedColumnName="two_key") -// }) - CKeyParent parent; - - public CKeyDetail() { - - } - - public CKeyDetail(String something) { - this.something = something; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getSomething() { - return something; - } - - public void setSomething(String something) { - this.something = something; - } - - public CKeyParent getParent() { - return parent; - } - - public void setParent(CKeyParent parent) { - this.parent = parent; - } - - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParent.java deleted file mode 100644 index e331399ed..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParent.java +++ /dev/null @@ -1,78 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "migtest_ckey_parent") -public class CKeyParent { - - @EmbeddedId - CKeyParentId id; - - String name; - - @Version - int version; - - @ManyToOne(cascade = CascadeType.PERSIST) - CKeyAssoc assoc; - - @OneToMany(cascade = CascadeType.PERSIST, mappedBy = "parent") - List details; - - public CKeyParentId getId() { - return id; - } - - public void setId(CKeyParentId id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public CKeyAssoc getAssoc() { - return assoc; - } - - public void setAssoc(CKeyAssoc assoc) { - this.assoc = assoc; - } - - public List getDetails() { - return details; - } - - public void setDetails(List details) { - this.details = details; - } - - public void add(CKeyDetail detail) { - if (details == null) { - details = new ArrayList<>(); - } - details.add(detail); - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParentId.java deleted file mode 100644 index 4d2723166..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParentId.java +++ /dev/null @@ -1,59 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.Embeddable; -import javax.validation.constraints.Size; - -@Embeddable -public class CKeyParentId { - - Integer oneKey; - - @Size(max=127) - String twoKey; - - public CKeyParentId() { - - } - - public CKeyParentId(Integer oneKey, String twoKey) { - this.oneKey = oneKey; - this.twoKey = twoKey; - } - - public Integer getOneKey() { - return oneKey; - } - - public void setOneKey(Integer oneKey) { - this.oneKey = oneKey; - } - - public String getTwoKey() { - return twoKey; - } - - public void setTwoKey(String twoKey) { - this.twoKey = twoKey; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof CKeyParentId)) { - return false; - } - - CKeyParentId otherKey = (CKeyParentId) o; - return otherKey.hashCode() == hashCode(); - } - - @Override - public int hashCode() { - int hc = getClass().getName().hashCode(); - hc = 31 * hc + oneKey; - hc = 31 * hc + twoKey.hashCode(); - return hc; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascade.java deleted file mode 100644 index 22f1c88f8..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascade.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_1; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_cascade") -public class DfkCascade { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.RESTRICT) - DfkCascadeOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascadeOne.java deleted file mode 100644 index 07a523039..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -import java.util.List; - -@Entity -@Table(name = "migtest_fk_cascade_one") -public class DfkCascadeOne { - - @Id - long id; - - @OneToMany(mappedBy = "one", cascade = CascadeType.ALL) - List details; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNone.java deleted file mode 100644 index 16129121f..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNone.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_1; - -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - - -@Entity -@Table(name = "migtest_fk_none") -public class DfkNone { - - @Id - long id; - - @ManyToOne - @DbForeignKey(noConstraint = false) - DfkOne one; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java deleted file mode 100644 index dae77dd67..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_none_via_join") -public class DfkNoneViaJoin { - - @Id - long id; - - @ManyToOne - @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.CONSTRAINT)) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkOne.java deleted file mode 100644 index eb04c6d64..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkOne.java +++ /dev/null @@ -1,13 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_one") -public class DfkOne { - - @Id - long id; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkSetNull.java deleted file mode 100644 index be199b097..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkSetNull.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_1; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_set_null") -public class DfkSetNull { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.RESTRICT) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EBasic.java deleted file mode 100644 index 50b53f736..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EBasic.java +++ /dev/null @@ -1,177 +0,0 @@ -package misc.migration.v1_1; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; -import io.ebean.annotation.Platform; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import java.sql.Timestamp; - -@Entity -@Table(name = "migtest_e_basic") -@Index(columnNames = { "status" , "indextest1"}, unique = true) -public class EBasic { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - - @EnumValue("?") - DONT_KNOW, - } - - public enum Progress { - @EnumValue("0") - START, - - @EnumValue("1") - RUN, - - @EnumValue("2") - END - } - - @Id - Integer id; - - @NotNull - @DbDefault("A") - Status status; - - @Size(max=127) - String status2; - - @Index(unique = true) - @Size(max=127) - String name; - - @DbMigration(preAlter = { "-- db2 does not support parial null indices :( - so we have to clean", - "update ${table} set status = 'N' where id = 1" }, platforms = Platform.DB2) - @DbMigration(preAlter = "-- rename all collisions") - @Column(unique = true) - @Size(max = 127) - String description; - - //@NotNull - //@DbDefault("2000-01-01T00:00:00") //- date time literals do not work for each platform yet - //@DbDefault("now") //- now does not work for mariaDb - // MariaDb requires: ALTER TABLE `migtest_e_basic` CHANGE `some_date` `some_date` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP; - Timestamp someDate; - - @NotNull - @DbDefault("foo'bar") - String newStringField; - - @NotNull - @DbDefault("true") - @DbMigration(postAdd = "update ${table} set ${column} = old_boolean") - Boolean newBooleanField; - - @NotNull - @DbDefault("true") - boolean newBooleanField2; - - @Size(max=127) - String indextest1; - - @Size(max=127) - String indextest2; - - @Index - @Size(max=127) - String indextest3; - - @Index(unique = true) - @Size(max=127) - String indextest4; - - @Index(unique = true) - @Size(max=127) - String indextest5; - - @Index(unique = false) - @Size(max=127) - String indextest6; - - @NotNull - @DbDefault("0") - Progress progress; - - @DbDefault("42") - int newInteger; - - @ManyToOne - @DbMigration(preAlter= "insert into migtest_e_user (id) select distinct user_id from migtest_e_basic") // ensure all users exist - EUser user; - - public EBasic() { - - } - - public EBasic(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Timestamp getSomeDate() { - return someDate; - } - - public void setSomeDate(Timestamp someDate) { - this.someDate = someDate; - } - - public String getNewStringField() { - return newStringField; - } - - public void setNewStringField(String newStringField) { - this.newStringField = newStringField; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EEnum.java deleted file mode 100644 index 577ede01d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EEnum.java +++ /dev/null @@ -1,18 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -@Entity -@Table(name = "migtest_e_enum") -public class EEnum { - - @Id - Integer id; - - @Size (max = 1) - String testStatus; // change to String from Enum Status -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory.java deleted file mode 100644 index 9cad6715c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory.java +++ /dev/null @@ -1,26 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.Platform; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.History; - -@Entity -@Table(name = "migtest_e_history") -@History -@DbComment("We have history now") -public class EHistory { - - @Id - Integer id; - - @DbComment("Column altered to long now") - @DbMigration(platforms = Platform.POSTGRES, - preAlter = "alter table ${table} alter column ${column} TYPE bigint USING (${column}::integer)") - Long testString; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory2.java deleted file mode 100644 index 7b05d9fe7..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory2.java +++ /dev/null @@ -1,35 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; -import io.ebean.annotation.NotNull; - -@Entity -@Table(name = "migtest_e_history2") -@History -public class EHistory2 { - - @Id - Integer id; - - @NotNull - @DbDefault("unknown") - String testString; - - @HistoryExclude - String testString2; - - @NotNull - @DbDefault("unknown") - String testString3; - - @Size(max = 20) - String newColumn; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory3.java deleted file mode 100644 index a3756572a..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory3.java +++ /dev/null @@ -1,23 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - - -@Entity -@Table(name = "migtest_e_history3") -@History -public class EHistory3 { - - @Id - Integer id; - - @HistoryExclude - String testString; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory4.java deleted file mode 100644 index ba5628390..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory4.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history4") -@History -public class EHistory4 { - - @Id - Integer id; - - Long testNumber; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory5.java deleted file mode 100644 index 9bb9aba0b..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory5.java +++ /dev/null @@ -1,27 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - - -@Entity -@Table(name = "migtest_e_history5") -@History -public class EHistory5 { - - @Id - Integer id; - - Integer testNumber; - - @NotNull - @DbDefault("false") - Boolean testBoolean; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory6.java deleted file mode 100644 index c05f51a15..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory6.java +++ /dev/null @@ -1,27 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - - -@Entity -@Table(name = "migtest_e_history6") -@History -public class EHistory6 { - - @Id - Integer id; - - @NotNull - @DbDefault("42") - Integer testNumber1; - - - Integer testNumber2; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/ESoftdelete.java deleted file mode 100644 index 3213ddcd3..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_1; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.SoftDelete; - -@Entity -@Table(name = "migtest_e_softdelete") -public class ESoftdelete { - - @Id - Integer id; - - - String testString; - - @SoftDelete - boolean deleted; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EUser.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EUser.java deleted file mode 100644 index 42b901033..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EUser.java +++ /dev/null @@ -1,13 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_e_user") -public class EUser { - - @Id - Integer id; -} \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmChild.java deleted file mode 100644 index 7cf239f91..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmChild.java +++ /dev/null @@ -1,45 +0,0 @@ -package misc.migration.v1_1; - -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_c") -public class MtmChild { - - @Id - Integer id; - - String name; - - @ManyToMany - List masters; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getMasters() { - return masters; - } - - public void setMasters(List masters) { - this.masters = masters; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmMaster.java deleted file mode 100644 index a095f630e..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmMaster.java +++ /dev/null @@ -1,50 +0,0 @@ -package misc.migration.v1_1; - -import java.util.List; - -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_m") -public class MtmMaster { - - @Id - Long id; - - String name; - - @ManyToMany - List children; - - @ElementCollection - List phoneNumbers; - - 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 getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoChild.java deleted file mode 100644 index dd42d0771..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoChild.java +++ /dev/null @@ -1,49 +0,0 @@ -package misc.migration.v1_1; - -import io.ebean.annotation.Index; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; - -import static io.ebean.annotation.Platform.POSTGRES; - -@Index(columnNames = "name", platforms = POSTGRES) -@Entity -@Table(name = "migtest_oto_child") -public class OtoChild { - - @Id - Integer id; - - String name; - - @OneToOne - OtoMaster master; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public OtoMaster getMaster() { - return master; - } - - public void setMaster(OtoMaster master) { - this.master = master; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoMaster.java deleted file mode 100644 index f44bbaa9d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoMaster.java +++ /dev/null @@ -1,45 +0,0 @@ -package misc.migration.v1_1; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_oto_master") -public class OtoMaster { - - @Id - Long id; - - String name; - - @OneToOne(cascade = CascadeType.ALL, mappedBy = "master") - OtoChild child; - - 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 OtoChild getChild() { - return child; - } - - public void setChild(OtoChild child) { - this.child = child; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyAssoc.java deleted file mode 100644 index 351bb3ca7..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyAssoc.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_assoc") -public class CKeyAssoc { - - @Id - Integer id; - - String assocOne; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getAssocOne() { - return assocOne; - } - - public void setAssocOne(String assocOne) { - this.assocOne = assocOne; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyDetail.java deleted file mode 100644 index c02288f0a..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyDetail.java +++ /dev/null @@ -1,41 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_ckey_detail") -public class CKeyDetail { - - @Id - Integer id; - - String something; - - - public CKeyDetail() { - - } - - public CKeyDetail(String something) { - this.something = something; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getSomething() { - return something; - } - - public void setSomething(String something) { - this.something = something; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParent.java deleted file mode 100644 index 7c44a42dc..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParent.java +++ /dev/null @@ -1,44 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; - -@Entity -@Table(name = "migtest_ckey_parent") -public class CKeyParent { - - @EmbeddedId - CKeyParentId id; - - String name; - - @Version - int version; - - public CKeyParentId getId() { - return id; - } - - public void setId(CKeyParentId id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParentId.java deleted file mode 100644 index a2f42926b..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParentId.java +++ /dev/null @@ -1,59 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.Embeddable; -import javax.validation.constraints.Size; - -@Embeddable -public class CKeyParentId { - - Integer oneKey; - - @Size(max=127) - String twoKey; - - public CKeyParentId() { - - } - - public CKeyParentId(Integer oneKey, String twoKey) { - this.oneKey = oneKey; - this.twoKey = twoKey; - } - - public Integer getOneKey() { - return oneKey; - } - - public void setOneKey(Integer oneKey) { - this.oneKey = oneKey; - } - - public String getTwoKey() { - return twoKey; - } - - public void setTwoKey(String twoKey) { - this.twoKey = twoKey; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof CKeyParentId)) { - return false; - } - - CKeyParentId otherKey = (CKeyParentId) o; - return otherKey.hashCode() == hashCode(); - } - - @Override - public int hashCode() { - int hc = getClass().getName().hashCode(); - hc = 31 * hc + oneKey; - hc = 31 * hc + twoKey.hashCode(); - return hc; - } -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascade.java deleted file mode 100644 index 31f91eb2a..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascade.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_cascade") -public class DfkCascade { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.CASCADE) - DfkCascadeOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascadeOne.java deleted file mode 100644 index 8cdb2a38a..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -import java.util.List; - -@Entity -@Table(name = "migtest_fk_cascade_one") -public class DfkCascadeOne { - - @Id - long id; - - @OneToMany(mappedBy = "one", cascade = CascadeType.ALL) - List details; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNone.java deleted file mode 100644 index 4bc65eb4d..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNone.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - - -@Entity -@Table(name = "migtest_fk_none") -public class DfkNone { - - @Id - long id; - - @ManyToOne - @DbForeignKey(noConstraint = true) - DfkOne one; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java deleted file mode 100644 index 809b17f76..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_none_via_join") -public class DfkNoneViaJoin { - - @Id - long id; - - @ManyToOne - @JoinColumn(name = "one_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkOne.java deleted file mode 100644 index f1141d186..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkOne.java +++ /dev/null @@ -1,13 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_one") -public class DfkOne { - - @Id - long id; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkSetNull.java deleted file mode 100644 index 01b643c99..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkSetNull.java +++ /dev/null @@ -1,22 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.ConstraintMode; -import io.ebean.annotation.DbForeignKey; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_fk_set_null") -public class DfkSetNull { - - @Id - long id; - - @ManyToOne - @DbForeignKey(onDelete = ConstraintMode.SET_NULL) - DfkOne one; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EBasic.java deleted file mode 100644 index eb2a16d9e..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EBasic.java +++ /dev/null @@ -1,131 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import java.sql.Timestamp; - -@Entity -@Table(name = "migtest_e_basic") -public class EBasic { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status status; - - @DbDefault("N") - @NotNull - Status status2; - - @Size(max=127) - String name; - - @Size(max=127) - String description; - - Timestamp someDate; - - boolean old_boolean; - - Boolean old_boolean2; - - @ManyToOne - ERef eref; - - - // test add & remove indices - @Index - @Size(max=127) - String indextest1; - - @Index(unique = true) - @Size(max=127) - String indextest2; - - @Size(max=127) - String indextest3; - - @Size(max=127) - String indextest4; - - @Index(unique = false) - @Size(max=127) - String indextest5; - - @Index(unique = true) - @Size(max=127) - String indextest6; - - @NotNull - @DbDefault("23") - int user_id; - - public EBasic() { - - } - - public EBasic(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Timestamp getSomeDate() { - return someDate; - } - - public void setSomeDate(Timestamp someDate) { - this.someDate = someDate; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EEnum.java deleted file mode 100644 index 26f2a5d31..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.EnumValue; - -@Entity -@Table(name = "migtest_e_enum") -public class EEnum { - - public enum Status { - @EnumValue("N") - NEW, - - @EnumValue("A") - ACTIVE, - - @EnumValue("I") - INACTIVE, - } - - @Id - Integer id; - - Status testStatus; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory.java deleted file mode 100644 index 0e166625c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory.java +++ /dev/null @@ -1,17 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_e_history") -public class EHistory { - - @Id - Integer id; - - - Long testString; // keep it as long as history prevents altering -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory2.java deleted file mode 100644 index 18a2c17fe..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory2.java +++ /dev/null @@ -1,26 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - -@Entity -@Table(name = "migtest_e_history2") -@History -public class EHistory2 { - - @Id - Integer id; - - - String testString; - - @HistoryExclude - String obsoleteString1; - - String obsoleteString2; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory3.java deleted file mode 100644 index f945e6e7b..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory3.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history3") -@History -public class EHistory3 { - - @Id - Integer id; - - String testString; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory4.java deleted file mode 100644 index 083928e5c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory4.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history4") -@History -public class EHistory4 { - - @Id - Integer id; - - Integer testNumber; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory5.java deleted file mode 100644 index 9de9206a0..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory5.java +++ /dev/null @@ -1,21 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.History; - - -@Entity -@Table(name = "migtest_e_history5") -@History -public class EHistory5 { - - @Id - Integer id; - - Integer testNumber; - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory6.java deleted file mode 100644 index 1d886ccb2..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory6.java +++ /dev/null @@ -1,26 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - - -@Entity -@Table(name = "migtest_e_history6") -@History -public class EHistory6 { - - @Id - Integer id; - - Integer testNumber1; - - @NotNull - @DbDefault("7") - Integer testNumber2; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ERef.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ERef.java deleted file mode 100644 index df16ba21c..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ERef.java +++ /dev/null @@ -1,28 +0,0 @@ -package misc.migration.v1_2; - -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; - -@Entity -@Table(name = "migtest_e_ref") -public class ERef { - - @Id - Integer id; - - @OneToMany - List basics; - - @NotNull - @Index(unique = true) - @Size(max=127) - String name; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ESoftdelete.java deleted file mode 100644 index 5987135e3..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ESoftdelete.java +++ /dev/null @@ -1,17 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_e_softdelete") -public class ESoftdelete { - - @Id - Integer id; - - - String testString; -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmChild.java deleted file mode 100644 index de83d8194..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmChild.java +++ /dev/null @@ -1,34 +0,0 @@ -package misc.migration.v1_2; - - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_c") -public class MtmChild { - - @Id - Integer id; - - String name; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmMaster.java deleted file mode 100644 index a1e5e41cf..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmMaster.java +++ /dev/null @@ -1,32 +0,0 @@ -package misc.migration.v1_2; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "migtest_mtm_m") -public class MtmMaster { - - @Id - Long id; - - String 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; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoChild.java deleted file mode 100644 index 39b298d8b..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoChild.java +++ /dev/null @@ -1,42 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.Index; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import static io.ebean.annotation.Platform.MYSQL; -import static io.ebean.annotation.Platform.POSTGRES; - -@Index(name = "ix_m12_otoc71", columnNames = "name", platforms = {POSTGRES}) -@Index(name = "ix_m12_otoc72", columnNames = "name", platforms = {MYSQL}) -@Index(unique = true, name = "uq_m12_otoc71", columnNames = "lower(name)", platforms = {POSTGRES}) -@Index(unique = true, name = "uq_m12_otoc72", columnNames = "name", platforms = {MYSQL}) -@Index(columnNames = "name", platforms = POSTGRES) -@Entity -@Table(name = "migtest_oto_child") -public class OtoChild { - - @Id - Integer id; - - String name; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoMaster.java deleted file mode 100644 index ef7f78cba..000000000 --- a/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoMaster.java +++ /dev/null @@ -1,40 +0,0 @@ -package misc.migration.v1_2; - -import io.ebean.annotation.Index; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import static io.ebean.annotation.Platform.MYSQL; -import static io.ebean.annotation.Platform.POSTGRES; - -@Index(columnNames = "name", platforms = {MYSQL}) -@Index(unique = true, columnNames = "lower(name)", platforms = {POSTGRES}) -@Index(unique = true, columnNames = "name", platforms = {MYSQL}) -@Entity -@Table(name = "migtest_oto_master") -public class OtoMaster { - - @Id - Long id; - - String 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; - } - -}