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

Fix bug in which abstract JPA entities were being mapped to tables when the 

declared inheritance strategy for the hierarchy was TABLE_PER_CLASS (which 
actually means table-per-concrete-class).



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@475321 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
A. Abram White 2006-11-15 17:43:02 +00:00
parent 3a5185700f
commit 728413153f
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
View File

@ -413,8 +413,6 @@ public class MappingRepository
*/
protected ClassStrategy namedStrategy(ClassMapping cls) {
String name = cls.getMappingInfo().getStrategy();
if (name == null)
return null;
return instantiateClassStrategy(name, cls);
}
@ -423,6 +421,8 @@ public class MappingRepository
*/
protected ClassStrategy instantiateClassStrategy(String name,
ClassMapping cls) {
if (name == null)
return null;
if (NoneClassStrategy.ALIAS.equals(name))
return NoneClassStrategy.getInstance();
@ -650,17 +650,27 @@ public class MappingRepository
return instantiateClassStrategy((String) strat, cls);
if (strat != null)
return (ClassStrategy) strat;
// see if there is a declared hierarchy strategy
ClassStrategy hstrat = null;
for (ClassMapping base = cls; base != null && hstrat == null;) {
hstrat = instantiateClassStrategy(base.getMappingInfo().
getHierarchyStrategy(), cls);
base = base.getMappedPCSuperclassMapping();
}
// the full strategy as applied to a hierarchy is a
// table-per-concrete-class strategy, so don't map abstract types
if (hstrat instanceof FullClassStrategy
&& !cls.isManagedInterface()
&& Modifier.isAbstract(cls.getDescribedType().getModifiers()))
return NoneClassStrategy.getInstance();
ClassMapping sup = cls.getMappedPCSuperclassMapping();
if (sup == null)
return new FullClassStrategy();
while (sup.getMappedPCSuperclassMapping() != null)
sup = sup.getMappedPCSuperclassMapping();
String subStrat = sup.getMappingInfo().getHierarchyStrategy();
if (subStrat != null)
return instantiateClassStrategy(subStrat, cls);
if (hstrat != null)
return hstrat;
return new FlatClassStrategy();
}