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/Feature.java
19 19

  
20 20
import javax.persistence.Entity;
21 21
import javax.persistence.FetchType;
22
import javax.persistence.JoinColumn;
23 22
import javax.persistence.JoinTable;
24 23
import javax.persistence.ManyToMany;
25 24
import javax.xml.bind.annotation.XmlAccessType;
......
119 118

  
120 119
    /* for M:M see #4843 */
121 120
	@ManyToMany(fetch = FetchType.LAZY)
122
    //join columns preliminary  #5369
123
	@JoinTable(
124
            name="DefinedTermBase_RecommendedModifierEnumeration",
125
            joinColumns = @JoinColumn( name="DefinedTermBase_id")
126
    )
121
    @JoinTable(name="DefinedTermBase_RecommendedModifierEnumeration")
127 122
	private final Set<TermVocabulary<DefinedTerm>> recommendedModifierEnumeration = new HashSet<TermVocabulary<DefinedTerm>>();
128 123

  
129 124
	@ManyToMany(fetch = FetchType.LAZY)
130
    //join columns preliminary  #5369
131
    @JoinTable(
132
            name="DefinedTermBase_StatisticalMeasure",
133
            joinColumns = @JoinColumn( name="DefinedTermBase_id")
134
    )
125
    @JoinTable(name="DefinedTermBase_StatisticalMeasure")
135 126
	private final Set<StatisticalMeasure> recommendedStatisticalMeasures = new HashSet<StatisticalMeasure>();
136 127

  
137 128
	/* for M:M see #4843 */
138 129
	@ManyToMany(fetch = FetchType.LAZY)
139
    //join columns preliminary  #5369
140
	@JoinTable(
141
            name="DefinedTermBase_SupportedCategoricalEnumeration",
142
            joinColumns = @JoinColumn( name="DefinedTermBase_id")
143
    )
130
	@JoinTable(name="DefinedTermBase_SupportedCategoricalEnumeration")
144 131
	private final Set<TermVocabulary<State>> supportedCategoricalEnumerations = new HashSet<TermVocabulary<State>>();
145 132

  
146 133

  
147 134
	@ManyToMany(fetch = FetchType.LAZY)
148
	//join columns preliminary  #5369
149
    @JoinTable(
150
            name="DefinedTermBase_MeasurementUnit",
151
            joinColumns = @JoinColumn( name="DefinedTermBase_id")
152
    )
135
    @JoinTable(name="DefinedTermBase_MeasurementUnit")
153 136
	private final Set<MeasurementUnit> recommendedMeasurementUnits = new HashSet<MeasurementUnit>();
154 137

  
155 138
/* ***************** CONSTRUCTOR AND FACTORY METHODS **********************************/

Also available in: Unified diff