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

OPENJPA-2601 fix 'hint' element in orm.xml parsing 

Txs to Kariem Hussein for the patch!


git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1692088 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Struberg 2015-07-21 11:25:35 +00:00
parent c4db9b05b8
commit 41c05d1bbe
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java
View File

@ -23,6 +23,9 @@ import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.openjpa.kernel.QueryHints;
import org.apache.openjpa.meta.QueryMetaData;
import org.apache.openjpa.persistence.meta.MetamodelImpl;
import org.apache.openjpa.persistence.test.SQLListenerTestCase; import org.apache.openjpa.persistence.test.SQLListenerTestCase;
import javax.persistence.*; import javax.persistence.*;
@ -161,7 +164,14 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
em.close(); em.close();
} }
public void testQueryHintOrmXml() {
QueryMetaData[] meta = ((MetamodelImpl) emf.getMetamodel()).getRepository().getQueryMetaDatas();
assertEquals(1, meta.length);
assertEquals("Country1.literal", meta[0].getName());
assertEquals(1, meta[0].getHintKeys().length);
assertEquals(QueryHints.HINT_USE_LITERAL_IN_SQL, meta[0].getHintKeys()[0]);
}
private void printArrayList(ArrayList aList) { private void printArrayList(ArrayList aList) {
Iterator itr = aList.iterator(); Iterator itr = aList.iterator();

4
openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/orm.xml
View File

@ -22,6 +22,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0"> version="1.0">
<package>org.apache.openjpa.persistence</package> <package>org.apache.openjpa.persistence</package>
<named-query name="Country1.literal">
<query>Select c from Country1 c where c.name = 'literal'</query>
<hint name="openjpa.hint.UseLiteralInSQL" value="true" />
</named-query>
<entity class="Security1"> <entity class="Security1">
<table name="SECURITY1" /> <table name="SECURITY1" />
<attributes> <attributes>

2
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
View File

@ -170,7 +170,7 @@ public class XMLPersistenceMetaDataParser
_elems.put("named-query", QUERY); _elems.put("named-query", QUERY);
_elems.put("named-native-query", NATIVE_QUERY); _elems.put("named-native-query", NATIVE_QUERY);
_elems.put("query-hint", QUERY_HINT); _elems.put("hint", QUERY_HINT);
_elems.put("query", QUERY_STRING); _elems.put("query", QUERY_STRING);
_elems.put("flush-mode", FLUSH_MODE); _elems.put("flush-mode", FLUSH_MODE);