Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-16 16:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix JdbcParameterBinding with RevisionType enum

Browse Source
This commit is contained in:
Chris Cranford 2021-03-09 17:18:06 -05:00 committed by Christian Beikov
parent 87a40f6c2f
commit 2cf8131f6e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java
View File

@ -14,6 +14,7 @@
import org.hibernate.envers.RevisionType; import org.hibernate.envers.RevisionType;
import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration;
import org.hibernate.envers.configuration.internal.GlobalConfiguration; import org.hibernate.envers.configuration.internal.GlobalConfiguration;
import org.hibernate.envers.internal.entities.RevisionTypeType;
import org.hibernate.envers.internal.entities.mapper.id.IdMapper; import org.hibernate.envers.internal.entities.mapper.id.IdMapper;
import org.hibernate.envers.internal.entities.mapper.id.QueryParameterData; import org.hibernate.envers.internal.entities.mapper.id.QueryParameterData;
import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData;
@ -21,6 +22,7 @@
import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.internal.tools.query.QueryBuilder;
import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.strategy.AuditStrategy;
import org.hibernate.query.Query; import org.hibernate.query.Query;
import org.hibernate.type.CustomType;
import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER;
import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER;
@ -65,7 +67,11 @@ public Query getQuery(SharedSessionContractImplementor session, Object primaryKe
final String queryString = getQueryString( session.getFactory(), removed ); final String queryString = getQueryString( session.getFactory(), removed );
final Query query = session.createQuery( queryString ); final Query query = session.createQuery( queryString );
query.setParameter( DEL_REVISION_TYPE_PARAMETER, RevisionType.DEL ); query.setParameter(
DEL_REVISION_TYPE_PARAMETER,
RevisionType.DEL,
new CustomType( new RevisionTypeType(), session.getFactory().getTypeConfiguration() )
);
query.setParameter( REVISION_PARAMETER, revision ); query.setParameter( REVISION_PARAMETER, revision );
final IdMapper prefixIdMapper = referencingIdData.getPrefixedMapper(); final IdMapper prefixIdMapper = referencingIdData.getPrefixedMapper();

2
hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java
View File

@ -133,7 +133,7 @@ protected void applyValidPredicates(QueryBuilder qb, Parameters rootParameters,
true true
); );
// e.revision_type != DEL // e.revision_type != DEL
rootParameters.addWhereWithNamedParam( getRevisionTypePath(), false, "!=", DEL_REVISION_TYPE_PARAMETER ); rootParameters.addWhereWithNamedParam( getRevisionTypePath(), true, "!=", DEL_REVISION_TYPE_PARAMETER );
} }
@Override @Override