Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct bug in our default for the name of an inverse join column within a 

join table.  Added configurable property for users to retain the old defaulting
for compatibility if desired.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@482737 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
A. Abram White 2006-12-05 18:54:46 +00:00
parent a836ea3f34
commit 87dc2aad7c
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
View File

@ -44,6 +44,8 @@ import serp.util.Strings;
public class PersistenceMappingDefaults public class PersistenceMappingDefaults
extends MappingDefaultsImpl { extends MappingDefaultsImpl {
private boolean _prependFieldNameToJoinTableInverseJoinColumns = true;
public PersistenceMappingDefaults() { public PersistenceMappingDefaults() {
setDefaultMissingInfo(true); setDefaultMissingInfo(true);
setStoreEnumOrdinal(true); setStoreEnumOrdinal(true);
@ -52,6 +54,24 @@ public class PersistenceMappingDefaults
setDiscriminatorColumnName("DTYPE"); setDiscriminatorColumnName("DTYPE");
} }
/**
* Whether to prepend the field name to the default name of inverse join
* columns within join tables. Defaults to true per spec, but set to false
* for compatibility with older versions of OpenJPA.
*/
public boolean getPrependFieldNameToJoinTableInverseJoinColumns() {
return _prependFieldNameToJoinTableInverseJoinColumns;
}
/**
* Whether to prepend the field name to the default name of inverse join
* columns within join tables. Defaults to true per spec, but set to false
* for compatibility with older versions of OpenJPA.
*/
public void setPrependFieldNameToJoinTableInverseJoinColumns(boolean val) {
_prependFieldNameToJoinTableInverseJoinColumns = val;
}
@Override @Override
public Object getStrategy(Version vers, boolean adapt) { public Object getStrategy(Version vers, boolean adapt) {
Object strat = super.getStrategy(vers, adapt); Object strat = super.getStrategy(vers, adapt);
@ -141,9 +161,10 @@ public class PersistenceMappingDefaults
Table local, Table foreign, Column col, Object target, boolean inverse, Table local, Table foreign, Column col, Object target, boolean inverse,
int pos, int cols) { int pos, int cols) {
// if this is a non-inverse collection element key, it must be in // if this is a non-inverse collection element key, it must be in
// a join table; jpa says to use the target column name, // a join table: if we're not prepending the field name, leave the
// which is the default // default
if (!inverse && vm == vm.getFieldMapping().getElement() if (!_prependFieldNameToJoinTableInverseJoinColumns && !inverse
&& vm == vm.getFieldMapping().getElement()
&& vm.getFieldMapping().getTypeCode() != JavaTypes.MAP) && vm.getFieldMapping().getTypeCode() != JavaTypes.MAP)
return; return;