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

HHH-3813 Fix flush of the join table before a criteria query.

This commit is contained in:
Etienne Miret 2015-02-07 16:29:51 +01:00 committed by Vlad Mihalcea
parent c6ea7fd359
commit de2e4a829f
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
View File

@ -40,6 +40,7 @@ import org.hibernate.hql.internal.ast.util.SessionFactoryHelper;
import org.hibernate.internal.CriteriaImpl;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.Loadable;
import org.hibernate.persister.entity.PropertyMapping;
import org.hibernate.persister.entity.Queryable;
@ -132,10 +133,23 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
}
public Set<Serializable> getQuerySpaces() {
Set<Serializable> result = new HashSet<Serializable>();
Set<Serializable> result = new HashSet<>();
for ( CriteriaInfoProvider info : criteriaInfoMap.values() ) {
result.addAll( Arrays.asList( info.getSpaces() ) );
}
for ( final Map.Entry<String, Criteria> entry : associationPathCriteriaMap.entrySet() ) {
String path = entry.getKey();
CriteriaImpl.Subcriteria crit = (CriteriaImpl.Subcriteria) entry.getValue();
int index = path.lastIndexOf( '.' );
if ( index > 0 ) {
path = path.substring( index + 1, path.length() );
}
CriteriaInfoProvider info = criteriaInfoMap.get( crit.getParent() );
CollectionPersister persister = getFactory().getMetamodel().collectionPersisters().get( info.getName() + "." + path );
if ( persister != null ) {
result.addAll( Arrays.asList( persister.getCollectionSpaces() ) );
}
}
return result;
}

55
hibernate-core/src/test/java/org/hibernate/test/flush/NativeCriteriaSyncTest.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.flush;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.junit.Assert.*;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.test.hql.SimpleEntityWithAssociation;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
/**
* @author Etienne Miret
*/
public class NativeCriteriaSyncTest extends BaseCoreFunctionalTestCase {
/**
* Tests that the join table of a many-to-many relationship is properly flushed before making a related Criteria
* query.
*/
@Test
@TestForIssue( jiraKey = "HHH-3813" )
public void test() {
final SimpleEntityWithAssociation e1 = new SimpleEntityWithAssociation( "e1" );
final SimpleEntityWithAssociation e2 = new SimpleEntityWithAssociation( "e2" );
e1.getManyToManyAssociatedEntities().add( e2 );
doInHibernate( this::sessionFactory, session -> {
session.save( e1 );
final Criteria criteria = session.createCriteria( SimpleEntityWithAssociation.class );
criteria.createCriteria( "manyToManyAssociatedEntities" ).add( Restrictions.eq( "name", "e2" ) );
assertEquals( 1, criteria.list().size() );
} );
}
@Override
protected String[] getMappings() {
return new String[] { "hql/SimpleEntityWithAssociation.hbm.xml" };
}
}