Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6109 bind sql result mapping and named query

This commit is contained in:
Strong Liu 2012-10-22 17:52:19 +08:00
parent 58e68ee58e
commit 1b62f92c07
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java
View File

@ -34,6 +34,8 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import javax.xml.bind.JAXBElement;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.hibernate.CacheMode; import org.hibernate.CacheMode;
@ -775,13 +777,20 @@ public class HibernateMappingProcessor {
String query = ""; String query = "";
boolean isQueryDefined = false; boolean isQueryDefined = false;
for ( Serializable obj : contents ) { for ( Serializable obj : contents ) {
if ( JaxbQueryParamElement.class.isInstance( obj ) ) { if(obj == null){
continue;
}
else if ( JaxbQueryParamElement.class.isInstance( obj ) ) {
JaxbQueryParamElement element = JaxbQueryParamElement.class.cast( obj ); JaxbQueryParamElement element = JaxbQueryParamElement.class.cast( obj );
queryParam.put( element.getName(), element.getType() ); queryParam.put( element.getName(), element.getType() );
} }
else if ( String.class.isInstance( obj ) ) { else if ( String.class.isInstance( obj ) ) {
if ( !isQueryDefined ) { if ( !isQueryDefined ) {
query = obj.toString(); if( StringHelper.isNotEmpty( obj.toString().trim() )){
query = obj.toString().trim();
isQueryDefined = true;
}
} }
else { else {
throw new MappingException( throw new MappingException(
@ -816,23 +825,30 @@ public class HibernateMappingProcessor {
@Override @Override
protected void parseExtra(String queryName, Serializable obj, NamedQueryDefinitionBuilder builder) { protected void parseExtra(String queryName, Serializable obj, NamedQueryDefinitionBuilder builder) {
if ( !JAXBElement.class.isInstance( obj ) ) {
return;
}
NamedSQLQueryDefinitionBuilder sqlBuilder = NamedSQLQueryDefinitionBuilder.class.cast( builder ); NamedSQLQueryDefinitionBuilder sqlBuilder = NamedSQLQueryDefinitionBuilder.class.cast( builder );
if ( JaxbSynchronizeElement.class.isInstance( obj ) ) { JAXBElement jaxbElement = JAXBElement.class.cast( obj );
JaxbSynchronizeElement element = JaxbSynchronizeElement.class.cast( obj ); Class targetType = jaxbElement.getDeclaredType();
Object value = jaxbElement.getValue();
if ( JaxbSynchronizeElement.class == targetType ) {
JaxbSynchronizeElement element = JaxbSynchronizeElement.class.cast( value );
synchronizedTables.add( element.getTable() ); synchronizedTables.add( element.getTable() );
} }
else if ( JaxbLoadCollectionElement.class.isInstance( obj ) ) { else if ( JaxbLoadCollectionElement.class == targetType ) {
loadCollectionElements.add( JaxbLoadCollectionElement.class.cast( obj ) ); loadCollectionElements.add( JaxbLoadCollectionElement.class.cast( value ) );
} }
else if ( JaxbReturnScalarElement.class.isInstance( obj ) ) { else if ( JaxbReturnScalarElement.class == targetType ) {
returnScalarElements.add( JaxbReturnScalarElement.class.cast( obj ) ); returnScalarElements.add( JaxbReturnScalarElement.class.cast( value ) );
} }
else if ( JaxbReturnElement.class.isInstance( obj ) ) { else if ( JaxbReturnElement.class == targetType ) {
returnElements.add( JaxbReturnElement.class.cast( obj ) ); returnElements.add( JaxbReturnElement.class.cast( value ) );
} }
else if ( JaxbReturnJoinElement.class.isInstance( obj ) ) { else if ( JaxbReturnJoinElement.class == targetType ) {
returnJoinElements.add( JaxbReturnJoinElement.class.cast( obj ) ); returnJoinElements.add( JaxbReturnJoinElement.class.cast( value ) );
} }
} }
} }

1
hibernate-core/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
View File

@ -38,7 +38,6 @@ import static org.junit.Assert.assertEquals;
/** /**
* @author Emmanuel Bernard * @author Emmanuel Bernard
*/ */
@FailureExpectedWithNewMetamodel
public class LoaderTest extends BaseCoreFunctionalTestCase { public class LoaderTest extends BaseCoreFunctionalTestCase {
@Override @Override
protected String[] getXmlFiles() { protected String[] getXmlFiles() {