mirror of https://github.com/apache/openjpa.git
Default name fix.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@482775 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d5fb9486ba
commit
ee33aa7af3
|
@ -160,19 +160,23 @@ public class PersistenceMappingDefaults
|
|||
public void populateForeignKeyColumn(ValueMapping vm, String name,
|
||||
Table local, Table foreign, Column col, Object target, boolean inverse,
|
||||
int pos, int cols) {
|
||||
boolean elem = vm == vm.getFieldMapping().getElement()
|
||||
&& vm.getFieldMapping().getTypeCode() != JavaTypes.MAP;
|
||||
|
||||
// if this is a non-inverse collection element key, it must be in
|
||||
// a join table: if we're not prepending the field name, leave the
|
||||
// default
|
||||
if (!_prependFieldNameToJoinTableInverseJoinColumns && !inverse
|
||||
&& vm == vm.getFieldMapping().getElement()
|
||||
&& vm.getFieldMapping().getTypeCode() != JavaTypes.MAP)
|
||||
if (!_prependFieldNameToJoinTableInverseJoinColumns && !inverse && elem)
|
||||
return;
|
||||
|
||||
// otherwise jpa always uses <field>_<pkcol> for column name, even
|
||||
// when only one col
|
||||
if (target instanceof Column)
|
||||
if (target instanceof Column) {
|
||||
if (elem)
|
||||
name = vm.getFieldMapping().getName();
|
||||
col.setName(name + "_" + ((Column) target).getName());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void populateColumns(Version vers, Table table, Column[] cols) {
|
||||
|
|
Loading…
Reference in New Issue