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

Fixed bug where NamedNativeQuery/NamedNativeQueries was not being examined when looking up named queries, which could result in them not being found if the metadata has not yet been parsed completely 

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@443432 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Marc Prud'hommeaux 2006-09-14 18:21:19 +00:00
parent 72f7b6b963
commit fcd072a2c5
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
View File

@ -30,6 +30,8 @@ import javax.persistence.Entity;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.NamedNativeQueries;
import javax.persistence.NamedNativeQuery;
import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configurable;
import org.apache.openjpa.lib.conf.Configuration; import org.apache.openjpa.lib.conf.Configuration;
@ -277,6 +279,13 @@ public class PersistenceMetaDataFactory
hasNamedQuery(queryName, ((NamedQueries) cls.getAnnotation hasNamedQuery(queryName, ((NamedQueries) cls.getAnnotation
(NamedQueries.class)).value())) (NamedQueries.class)).value()))
return cls; return cls;
if (cls.isAnnotationPresent(NamedNativeQuery.class) && hasNamedNativeQuery
(queryName, (NamedNativeQuery) cls.getAnnotation(NamedNativeQuery.class)))
return cls;
if (cls.isAnnotationPresent(NamedNativeQueries.class) &&
hasNamedNativeQuery(queryName, ((NamedNativeQueries) cls.getAnnotation
(NamedNativeQueries.class)).value()))
return cls;
} }
return null; return null;
} }
@ -289,6 +298,15 @@ public class PersistenceMetaDataFactory
return false; return false;
} }
private boolean hasNamedNativeQuery(String query,
NamedNativeQuery... queries) {
for (NamedNativeQuery q : queries) {
if (query.equals(q.name()))
return true;
}
return false;
}
@Override @Override
protected MetaDataFilter newMetaDataFilter() { protected MetaDataFilter newMetaDataFilter() {
return new ClassAnnotationMetaDataFilter(new Class[]{ return new ClassAnnotationMetaDataFilter(new Class[]{