Skip to content

Commit d14ea11

Browse files
committed
fix
1 parent a4adc14 commit d14ea11

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinyStatelessSessionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Mutiny.MutationQuery createMutationQuery(String queryString) {
9393

9494
@Override
9595
public <R> Query<R> createNamedQuery(String queryName) {
96-
return new MutinyQueryImpl<>( delegate.createReactiveNamedQuery( queryName, null ), factory );
96+
return new MutinyQueryImpl<>( delegate.createReactiveNamedQuery( queryName ), factory );
9797
}
9898

9999
@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleDeleteQueryPlan.java

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
import org.hibernate.sql.ast.SqlAstTranslator;
3838
import org.hibernate.sql.ast.tree.AbstractUpdateOrDeleteStatement;
3939
import org.hibernate.sql.ast.tree.MutationStatement;
40-
import org.hibernate.sql.ast.tree.expression.ColumnReference;
4140
import org.hibernate.sql.ast.tree.expression.Expression;
42-
import org.hibernate.sql.ast.tree.expression.JdbcLiteral;
4341
import org.hibernate.sql.ast.tree.from.MutatingTableReferenceGroupWrapper;
4442
import org.hibernate.sql.ast.tree.from.NamedTableReference;
4543
import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate;
@@ -95,29 +93,28 @@ protected SqlAstTranslator<? extends JdbcOperationQueryMutation> createTranslato
9593
return factory.getJdbcServices()
9694
.getJdbcEnvironment()
9795
.getSqlAstTranslatorFactory()
98-
.buildMutationTranslator( factory, mutationStatement() );
96+
.buildMutationTranslator( factory, createDeleteAst() );
9997
}
10098

101-
private MutationStatement mutationStatement() {
99+
// Copy and paste from superclass
100+
private MutationStatement createDeleteAst() {
101+
final MutationStatement ast;
102102
if ( entityDescriptor.getSoftDeleteMapping() == null ) {
103-
return sqmInterpretation.getSqlAst();
103+
ast = sqmInterpretation.getSqlAst();
104104
}
105-
final AbstractUpdateOrDeleteStatement sqlDeleteAst = sqmInterpretation.getSqlAst();
106-
final NamedTableReference targetTable = sqlDeleteAst.getTargetTable();
107-
final SoftDeleteMapping columnMapping = getEntityDescriptor().getSoftDeleteMapping();
108-
final ColumnReference columnReference = new ColumnReference( targetTable, columnMapping );
109-
//noinspection rawtypes,unchecked
110-
final JdbcLiteral jdbcLiteral = new JdbcLiteral(
111-
columnMapping.getDeletedLiteralValue(),
112-
columnMapping.getJdbcMapping()
113-
);
114-
final Assignment assignment = new Assignment( columnReference, jdbcLiteral );
115-
116-
return new UpdateStatement(
117-
targetTable,
118-
Collections.singletonList( assignment ),
119-
sqlDeleteAst.getRestriction()
120-
);
105+
else {
106+
final AbstractUpdateOrDeleteStatement sqlDeleteAst = sqmInterpretation.getSqlAst();
107+
final NamedTableReference targetTable = sqlDeleteAst.getTargetTable();
108+
final SoftDeleteMapping columnMapping = getEntityDescriptor().getSoftDeleteMapping();
109+
final Assignment assignment = columnMapping.createSoftDeleteAssignment( targetTable );
110+
111+
ast = new UpdateStatement(
112+
targetTable,
113+
Collections.singletonList( assignment ),
114+
sqlDeleteAst.getRestriction()
115+
);
116+
}
117+
return ast;
121118
}
122119

123120
@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public <T> ReactiveNativeQueryImplementor<T> createReactiveNativeQuery(String sq
389389
delayedAfterCompletion();
390390

391391
try {
392-
final ReactiveNativeQueryImpl<T> query = new ReactiveNativeQueryImpl<>( sqlString, mthis );
392+
final ReactiveNativeQueryImpl<T> query = new ReactiveNativeQueryImpl<>( sqlString, this );
393393
if ( isEmpty( query.getComment() ) ) {
394394
query.setComment( "dynamic native SQL query" );
395395
}

0 commit comments

Comments
 (0)