Project

General

Profile

« Previous | Next » 

Revision ef1b5da2

Added by Andreas Müller almost 8 years ago

Adapt table and column names to hibernate 5 naming strategy #5369

... and some other changes to table/attribute names

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java
14 14

  
15 15
import javax.persistence.Entity;
16 16
import javax.persistence.FetchType;
17
import javax.persistence.JoinColumn;
18 17
import javax.persistence.JoinTable;
19 18
import javax.persistence.ManyToMany;
20 19
import javax.persistence.OneToMany;
......
74 73
	@XmlIDREF
75 74
	@XmlSchemaType(name = "IDREF")
76 75
	@ManyToMany(fetch = FetchType.LAZY)
77
	//preliminary  #5369
78
	//TODO should we also name the JoinTable here as for the other scopes
79
	//we may want to rename it to MediaKey_CoveredTaxa/Taxon
80
    @JoinTable(joinColumns = @JoinColumn( name="Media_id"))
76
    @JoinTable(name="MediaKey_CoveredTaxon")
81 77
    @NotNull
82 78
	private Set<Taxon> coveredTaxa = new HashSet<Taxon>();
83 79

  
......
86 82
	@XmlIDREF
87 83
	@XmlSchemaType(name = "IDREF")
88 84
	@ManyToMany(fetch = FetchType.LAZY)
89
	//preliminary  #5369
90
	@JoinTable(
91
	        name="MediaKey_NamedArea",
92
	        joinColumns = @JoinColumn( name="Media_id")
93
	)
85
	@JoinTable(name="MediaKey_NamedArea")
94 86
	@NotNull
95 87
	private Set<NamedArea> geographicalScope = new HashSet<NamedArea>();
96 88

  
......
99 91
	@XmlIDREF
100 92
	@XmlSchemaType(name = "IDREF")
101 93
	@ManyToMany(fetch = FetchType.LAZY)
102
	@JoinTable(
103
	        name="MediaKey_Taxon",
104
	        joinColumns=@JoinColumn(name="mediaKey_id"),
105
	        inverseJoinColumns=@JoinColumn(name="taxon_id")
106
	)
94
	@JoinTable(name="MediaKey_TaxonScope")
107 95
	@NotNull
108 96
	private Set<Taxon> taxonomicScope = new HashSet<Taxon>();
109 97

  
......
112 100
	@XmlIDREF
113 101
	@XmlSchemaType(name = "IDREF")
114 102
	@ManyToMany(fetch = FetchType.LAZY)
115
	//preliminary  #5369
116
    @JoinTable(
117
	        name="MediaKey_Scope",
118
            joinColumns = @JoinColumn( name="Media_id"))
103
    @JoinTable(name="MediaKey_Scope")
119 104
	@NotNull
120 105
	private Set<DefinedTerm> scopeRestrictions = new HashSet<DefinedTerm>();
121 106

  
......
124 109
	@XmlIDREF
125 110
	@XmlSchemaType(name = "IDREF")
126 111
	@OneToMany(fetch=FetchType.LAZY, orphanRemoval=true)
127
	@JoinTable(joinColumns = @JoinColumn(name="Media_id"))
128 112
	@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE,CascadeType.DELETE})
129 113
	@NotNull
130 114
	private Set<Representation> keyRepresentations = new HashSet<Representation>();

Also available in: Unified diff