github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-03 00:23:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

#896 - Bump persistence API 2.1.2 with @Repeatable annotations (most notably, @AttributeOverride and @JoinColumn)

Browse Source
This commit is contained in:
Rob Bygrave committed 2016-11-24 19:47:08 +13:00
1 parent 063c1825ca
commit 2ab98a922d
4 files changed
+11 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java
+2 -5
View File
@@ -1,7 +1,6 @@
package com.avaje.tests.compositekeys.db;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -11,10 +10,8 @@ import javax.persistence.Version;
public class CaoBean {
@Id
@AttributeOverrides({
@AttributeOverride(name = "customer", column = @Column(name = "x_cust_id")),
@AttributeOverride(name = "type", column = @Column(name = "x_type_id"))
})
@AttributeOverride(name = "customer", column = @Column(name = "x_cust_id"))
@AttributeOverride(name = "type", column = @Column(name = "x_type_id"))
private CaoKey key;
private String description;
src/test/java/com/avaje/tests/compositekeys/db/Item.java
+8 -14
View File
@@ -25,29 +25,23 @@ public class Item {
private int region;
@Embedded
@AttributeOverrides({
@AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED")),
@AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED")),
@AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY")),
@AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
})
@AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED"))
@AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED"))
@AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY"))
@AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
private AuditInfo auditInfo = new AuditInfo();
@Version
private Long version;
@ManyToOne
@JoinColumns({
@JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
@JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
})
@JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false)
@JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
private Type eType;
@ManyToOne
@JoinColumns({
@JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
@JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
})
@JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false)
@JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
private Region eRegion;
public ItemKey getKey() {
src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java
-3
View File
@@ -10,9 +10,6 @@ import javax.persistence.Version;
public class PrimaryRevision {
@EmbeddedId
// @AttributeOverrides({
// @AttributeOverride(name="primaryId", column = @Column(name="id"))
// })
@AttributeOverride(name = "primaryId", column = @Column(name = "id"))
private RevisionId revisionId;