Skip to content

attempt to sync code with ORM #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

attempt to sync code with ORM #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,20 +415,27 @@ public void prepareForQueryExecution(boolean requiresTxn) {
@Override
public <T> ReactiveNativeQuery<T> createReactiveNativeQuery(String sqlString, Class<T> resultClass) {
final ReactiveNativeQuery<T> query = createReactiveNativeQuery( sqlString );
return addResultType( resultClass, query );
setTupleTransformerForResultType( resultClass, query );
return query;
}

private <T> ReactiveNativeQuery<T> addResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
// see AbstractSharedSessionContract.setTupleTransformerForResultType
private <T> void setTupleTransformerForResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
query.setTupleTransformer( NativeQueryTupleTransformer.INSTANCE );
}
// else if ( Map.class.equals( resultClass ) ) {
// query.setTupleTransformer( NativeQueryMapTransformer.INSTANCE );
// }
// else if ( List.class.equals( resultClass ) ) {
// query.setTupleTransformer( NativeQueryListTransformer.INSTANCE );
// }
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else if ( resultClass != Object.class && resultClass != Object[].class ) {
query.addResultTypeClass( resultClass );
}
return query;
}

@Override
Expand Down Expand Up @@ -610,7 +617,8 @@ private void addAffectedEntities(AffectedEntities affectedEntities, NativeQueryI
@Override
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String queryString, Class<R> resultType, AffectedEntities affectedEntities) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( queryString, affectedEntities );
return addResultType( resultType, query );
setTupleTransformerForResultType( resultType, query );
return query;
}

@Override
Expand Down
64 changes: 25 additions & 39 deletions ...-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
import org.hibernate.query.criteria.JpaCriteriaQuery;
import org.hibernate.query.criteria.JpaRoot;
import org.hibernate.query.hql.spi.SqmQueryImplementor;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.spi.HqlInterpretation;
import org.hibernate.query.spi.QueryImplementor;
import org.hibernate.query.sql.internal.NativeQueryImpl;
import org.hibernate.query.sql.spi.NativeQueryImplementor;
import org.hibernate.query.sqm.internal.SqmUtil;
import org.hibernate.query.sqm.tree.SqmStatement;
Expand Down Expand Up @@ -878,8 +876,7 @@ public <R> ReactiveNativeQueryImplementor<R> createReactiveNativeQuery(String sq
delayedAfterCompletion();

try {
ReactiveNativeQueryImpl<R> query = new ReactiveNativeQueryImpl<>( sqlString, this);

final ReactiveNativeQueryImpl<R> query = new ReactiveNativeQueryImpl<>( sqlString, this );
if ( isEmpty( query.getComment() ) ) {
query.setComment( "dynamic native SQL query" );
}
Expand All @@ -893,17 +890,28 @@ public <R> ReactiveNativeQueryImplementor<R> createReactiveNativeQuery(String sq

@Override
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Class<R> resultClass) {
ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
setTupleTransformerForResultType( resultClass, query );
return query;
}

// see AbstractSharedSessionContract.setTupleTransformerForResultType
private <R> void setTupleTransformerForResultType(Class<R> resultClass, ReactiveNativeQuery<R> query) {
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
query.setTupleTransformer( NativeQueryTupleTransformer.INSTANCE );
}
// else if ( Map.class.equals( resultClass ) ) {
// query.setTupleTransformer( NativeQueryMapTransformer.INSTANCE );
// }
// else if ( List.class.equals( resultClass ) ) {
// query.setTupleTransformer( NativeQueryListTransformer.INSTANCE );
// }
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else {
( (NativeQueryImpl<?>) query ).addScalar( 1, resultClass );
else if ( resultClass != Object.class && resultClass != Object[].class ) {
query.addResultTypeClass( resultClass );
}
return query;
}

@Override
Expand All @@ -912,12 +920,13 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(
Class<R> resultClass,
String tableAlias) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
if ( getFactory().getMappingMetamodel().isEntityClass(resultClass) ) {
if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( tableAlias, resultClass.getName(), LockMode.READ );
return query;
}

throw new UnknownEntityTypeException( "unable to locate persister: " + resultClass.getName() );
else {
throw new UnknownEntityTypeException( "unable to locate persister: " + resultClass.getName() );
}
}

@Override
Expand All @@ -927,19 +936,9 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, St
delayedAfterCompletion();

try {
if ( isNotEmpty( resultSetMappingName ) ) {
final NamedResultSetMappingMemento resultSetMappingMemento = getFactory().getQueryEngine()
.getNamedObjectRepository()
.getResultSetMappingMemento( resultSetMappingName );

if ( resultSetMappingMemento == null ) {
throw new HibernateException( "Could not resolve specified result-set mapping name : " + resultSetMappingName );
}
return new ReactiveNativeQueryImpl<>( sqlString, resultSetMappingMemento, this );
}
else {
return new ReactiveNativeQueryImpl<>( sqlString, this );
}
return isNotEmpty( resultSetMappingName )
? new ReactiveNativeQueryImpl<>( sqlString, getResultSetMappingMemento( resultSetMappingName ), this )
: new ReactiveNativeQueryImpl<>( sqlString, this );
//TODO: why no applyQuerySettingsAndHints( query ); ???
}
catch (RuntimeException he) {
Expand Down Expand Up @@ -1097,20 +1096,7 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(
Class<R> resultType,
AffectedEntities affectedEntities) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( queryString, affectedEntities );
return addResultType( resultType, query );
}

//TODO: copy/paste from ORM, change visibility
private <T> ReactiveNativeQuery<T> addResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
}
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else if ( resultClass != Object.class && resultClass != Object[].class ) {
query.addScalar( 1, resultClass );
}
setTupleTransformerForResultType( resultType, query );
return query;
}

Expand Down
Loading