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

HHH-2851 : ParameterTranslationsImpl fails to correctly determine parameter type 

(cherry picked from commit d0d0963c18)
This commit is contained in:
Gail Badner 2015-06-17 15:41:19 -07:00
parent 66c193f511
commit acf765dad8
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java
View File

@ -126,6 +126,11 @@ public class ParameterTranslationsImpl implements ParameterTranslations {
paramHolder.type = namedSpec.getExpectedType();
namedParameterMap.put( namedSpec.getName(), paramHolder );
}
else if ( paramHolder.type == null && namedSpec.getExpectedType() != null ) {
// previous reference to the named parameter did not have type determined;
// this time, it can be determined by namedSpec.getExpectedType().
paramHolder.type = namedSpec.getExpectedType();
}
paramHolder.positions.add( i );
}
// don't care about other param types here, just those explicitly user-defined...

80
hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
View File

@ -662,6 +662,86 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase {
session.close();
}
@Test
@TestForIssue( jiraKey = "HHH-2851")
public void testMultipleRefsToSameParam() {
Session s = openSession();
s.beginTransaction();
Human h = new Human();
h.setName( new Name( "Johnny", 'B', "Goode" ) );
s.save( h );
h = new Human();
h.setName( new Name( "Steve", null, "Ebersole" ) );
s.save( h );
h = new Human();
h.setName( new Name( "Bono", null, null ) );
s.save( h );
h = new Human();
h.setName( new Name( "Steve", 'Z', "Johnny" ) );
h.setIntValue( 1 );
s.save( h );
h = new Human();
h.setName( new Name( null, null, null ) );
s.save( h );
s.getTransaction().commit();
s.close();
s = openSession();
s.beginTransaction();
List results = s.createQuery( "from Human where name.first = :name or name.last=:name" )
.setParameter( "name", "Johnny" )
.list();
assertEquals( 2, results.size() );
results = s.createQuery( "from Human where name.last = :name or :name is null" )
.setParameter( "name", "Goode" )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where :name is null or name.last = :name" )
.setParameter( "name", "Goode" )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where name.first = :firstName and (name.last = :name or :name is null)" )
.setParameter( "firstName", "Bono" )
.setParameter( "name", null )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where name.first = :firstName and ( :name is null or name.last = :name )" )
.setParameter( "firstName", "Bono" )
.setParameter( "name", null )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where intValue = :intVal or :intVal is null" )
.setParameter( "intVal", 1 )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where :intVal is null or intValue = :intVal" )
.setParameter( "intVal", 1 )
.list();
assertEquals( 1, results.size() );
results = s.createQuery( "from Human where intValue = :intVal or :intVal is null" )
.setParameter( "intVal", null )
.list();
assertEquals( 5, results.size() );
results = s.createQuery( "from Human where :intVal is null or intValue = :intVal" )
.setParameter( "intVal", null )
.list();
assertEquals( 5, results.size() );
s.getTransaction().commit();
s.close();
s = openSession();
s.beginTransaction();
s.createQuery( "delete Human" ).executeUpdate();
s.getTransaction().commit();
s.close();
}
@Test
public void testComponentNullnessChecks() {
Session s = openSession();