Skip to content

Commit 870bb5b

Browse files
beikovbeikov
committed
HHH-18563 Add set clause foreign key target tables to affected tables
1 parent 2a1e6d5 commit 870bb5b

File tree

12 files changed

+300
-69
lines changed

12 files changed

+300
-69
lines changed

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.hibernate.query.common.FetchClauseType;
2323
import org.hibernate.query.common.FrameExclusion;
2424
import org.hibernate.query.common.FrameKind;
25+
import org.hibernate.query.sqm.sql.internal.SqmPathInterpretation;
2526
import org.hibernate.sql.ast.Clause;
2627
import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
2728
import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
@@ -55,7 +56,9 @@
5556
import org.hibernate.sql.ast.tree.select.QueryPart;
5657
import org.hibernate.sql.ast.tree.select.QuerySpec;
5758
import org.hibernate.sql.ast.tree.select.SelectClause;
59+
import org.hibernate.sql.ast.tree.select.SelectStatement;
5860
import org.hibernate.sql.ast.tree.select.SortSpecification;
61+
import org.hibernate.sql.ast.tree.update.Assignable;
5962
import org.hibernate.sql.ast.tree.update.Assignment;
6063
import org.hibernate.sql.ast.tree.update.UpdateStatement;
6164
import org.hibernate.sql.exec.spi.JdbcOperation;
@@ -670,11 +673,18 @@ private boolean supportsOffsetFetchClause() {
670673

671674
@Override
672675
protected void visitSetAssignment(Assignment assignment) {
676+
final Assignable assignable = assignment.getAssignable();
677+
if ( assignable instanceof SqmPathInterpretation<?> ) {
678+
final String affectedTableName = ( (SqmPathInterpretation<?>) assignable ).getAffectedTableName();
679+
if ( affectedTableName != null ) {
680+
addAffectedTableName( affectedTableName );
681+
}
682+
}
673683
final List<ColumnReference> columnReferences = assignment.getAssignable().getColumnReferences();
684+
final Expression assignedValue = assignment.getAssignedValue();
674685
if ( columnReferences.size() == 1 ) {
675686
columnReferences.get( 0 ).appendColumnForWrite( this );
676687
appendSql( '=' );
677-
final Expression assignedValue = assignment.getAssignedValue();
678688
final SqlTuple sqlTuple = SqlTupleContainer.getSqlTuple( assignedValue );
679689
if ( sqlTuple != null ) {
680690
assert sqlTuple.getExpressions().size() == 1;
@@ -684,7 +694,7 @@ protected void visitSetAssignment(Assignment assignment) {
684694
assignedValue.accept( this );
685695
}
686696
}
687-
else {
697+
else if ( assignedValue instanceof SelectStatement ) {
688698
char separator = OPEN_PARENTHESIS;
689699
for ( ColumnReference columnReference : columnReferences ) {
690700
appendSql( separator );
@@ -694,5 +704,18 @@ protected void visitSetAssignment(Assignment assignment) {
694704
appendSql( ")=" );
695705
assignment.getAssignedValue().accept( this );
696706
}
707+
else {
708+
assert assignedValue instanceof SqlTupleContainer;
709+
final List<? extends Expression> expressions = ( (SqlTupleContainer) assignedValue ).getSqlTuple().getExpressions();
710+
columnReferences.get( 0 ).appendColumnForWrite( this, null );
711+
appendSql( '=' );
712+
expressions.get( 0 ).accept( this );
713+
for ( int i = 1; i < columnReferences.size(); i++ ) {
714+
appendSql( ',' );
715+
columnReferences.get( i ).appendColumnForWrite( this, null );
716+
appendSql( '=' );
717+
expressions.get( i ).accept( this );
718+
}
719+
}
697720
}
698721
}

‎hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.hibernate.query.common.FetchClauseType;
2121
import org.hibernate.query.common.FrameExclusion;
2222
import org.hibernate.query.common.FrameKind;
23+
import org.hibernate.query.sqm.sql.internal.SqmPathInterpretation;
2324
import org.hibernate.sql.ast.Clause;
2425
import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
2526
import org.hibernate.sql.ast.spi.SqlSelection;
@@ -53,7 +54,9 @@
5354
import org.hibernate.sql.ast.tree.select.QueryPart;
5455
import org.hibernate.sql.ast.tree.select.QuerySpec;
5556
import org.hibernate.sql.ast.tree.select.SelectClause;
57+
import org.hibernate.sql.ast.tree.select.SelectStatement;
5658
import org.hibernate.sql.ast.tree.select.SortSpecification;
59+
import org.hibernate.sql.ast.tree.update.Assignable;
5760
import org.hibernate.sql.ast.tree.update.Assignment;
5861
import org.hibernate.sql.ast.tree.update.UpdateStatement;
5962
import org.hibernate.sql.exec.spi.JdbcOperation;
@@ -627,11 +630,18 @@ private boolean supportsOffsetFetchClause() {
627630

628631
@Override
629632
protected void visitSetAssignment(Assignment assignment) {
633+
final Assignable assignable = assignment.getAssignable();
634+
if ( assignable instanceof SqmPathInterpretation<?> ) {
635+
final String affectedTableName = ( (SqmPathInterpretation<?>) assignable ).getAffectedTableName();
636+
if ( affectedTableName != null ) {
637+
addAffectedTableName( affectedTableName );
638+
}
639+
}
630640
final List<ColumnReference> columnReferences = assignment.getAssignable().getColumnReferences();
641+
final Expression assignedValue = assignment.getAssignedValue();
631642
if ( columnReferences.size() == 1 ) {
632643
columnReferences.get( 0 ).appendColumnForWrite( this );
633644
appendSql( '=' );
634-
final Expression assignedValue = assignment.getAssignedValue();
635645
final SqlTuple sqlTuple = SqlTupleContainer.getSqlTuple( assignedValue );
636646
if ( sqlTuple != null ) {
637647
assert sqlTuple.getExpressions().size() == 1;
@@ -641,15 +651,28 @@ protected void visitSetAssignment(Assignment assignment) {
641651
assignedValue.accept( this );
642652
}
643653
}
644-
else {
654+
else if ( assignedValue instanceof SelectStatement ) {
645655
char separator = OPEN_PARENTHESIS;
646656
for ( ColumnReference columnReference : columnReferences ) {
647657
appendSql( separator );
648658
columnReference.appendColumnForWrite( this );
649659
separator = COMMA_SEPARATOR_CHAR;
650660
}
651661
appendSql( ")=" );
652-
assignment.getAssignedValue().accept( this );
662+
assignedValue.accept( this );
663+
}
664+
else {
665+
assert assignedValue instanceof SqlTupleContainer;
666+
final List<? extends Expression> expressions = ( (SqlTupleContainer) assignedValue ).getSqlTuple().getExpressions();
667+
columnReferences.get( 0 ).appendColumnForWrite( this, null );
668+
appendSql( '=' );
669+
expressions.get( 0 ).accept( this );
670+
for ( int i = 1; i < columnReferences.size(); i++ ) {
671+
appendSql( ',' );
672+
columnReferences.get( i ).appendColumnForWrite( this, null );
673+
appendSql( '=' );
674+
expressions.get( i ).accept( this );
675+
}
653676
}
654677
}
655678

‎hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ private List<Assignment> getCompatibleAssignments(InsertSelectStatement dmlState
12991299
final List<Assignment> assignments = conflictClause.getAssignments();
13001300
for ( Assignment assignment : assignments ) {
13011301
for ( ColumnReference targetColumn : dmlStatement.getTargetColumns() ) {
1302-
if ( targetColumn.equals( assignment.getAssignable() ) ) {
1302+
if ( assignment.getAssignable().getColumnReferences().contains( targetColumn ) ) {
13031303
if ( compatibleAssignments == null ) {
13041304
compatibleAssignments = new ArrayList<>( assignments.size() );
13051305
}

‎hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java‎

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -858,36 +858,56 @@ public List<Assignment> visitSetClause(SqmSetClause setClause) {
858858
final SqmExpression<?> assignmentValue = sqmAssignment.getValue();
859859
final SqmParameter<?> assignmentValueParameter = getSqmParameter( assignmentValue );
860860
final Expression pathSqlExpression = assignedPathInterpretation.getSqlExpression();
861-
final List<? extends Expression> targetColumnReferences =
861+
//noinspection unchecked
862+
final List<ColumnReference> targetColumnReferences =
862863
pathSqlExpression instanceof SqlTuple sqlTuple
863-
? sqlTuple.getExpressions()
864+
? (List<ColumnReference>) sqlTuple.getExpressions()
864865
: pathSqlExpression.getColumnReference().getColumnReferences();
865866
if ( assignmentValueParameter != null ) {
867+
final ArrayList<Expression> expressions = new ArrayList<>( targetColumnReferences.size() );
866868
consumeSqmParameter(
867869
assignmentValueParameter,
868870
assignedPathInterpretation.getExpressionType(),
869-
(index, jdbcParameter) -> addAssignment(
870-
assignments,
871-
aggregateColumnAssignmentHandler,
872-
targetColumnReferences.get( index ),
873-
jdbcParameter
874-
)
871+
(index, jdbcParameter) -> expressions.add( jdbcParameter )
875872
);
876-
}
877-
else if ( assignmentValue instanceof SqmLiteralNull<?> ) {
878-
for ( Expression columnReference : targetColumnReferences ) {
873+
if ( pathSqlExpression instanceof SqlTuple ) {
874+
addAssignment(
875+
assignments,
876+
aggregateColumnAssignmentHandler,
877+
(Assignable) assignedPathInterpretation,
878+
targetColumnReferences,
879+
new SqlTuple( expressions, assignedPathInterpretation.getExpressionType() )
880+
);
881+
}
882+
else {
883+
assert expressions.size() == 1;
879884
addAssignment(
880885
assignments,
881886
aggregateColumnAssignmentHandler,
882-
columnReference,
883-
new QueryLiteral<>( null, (BasicValuedMapping) columnReference.getExpressionType() )
887+
(Assignable) assignedPathInterpretation,
888+
targetColumnReferences,
889+
expressions.get( 0 )
884890
);
885891
}
886892
}
893+
else if ( assignmentValue instanceof SqmLiteralNull<?> ) {
894+
final ArrayList<Expression> expressions = new ArrayList<>( targetColumnReferences.size() );
895+
for ( ColumnReference targetColumnReference : targetColumnReferences ) {
896+
expressions.add( new QueryLiteral<>( null,
897+
(SqlExpressible) targetColumnReference.getExpressionType() ) );
898+
}
899+
addAssignment(
900+
assignments,
901+
aggregateColumnAssignmentHandler,
902+
(Assignable) assignedPathInterpretation,
903+
targetColumnReferences,
904+
new SqlTuple( expressions, assignedPathInterpretation.getExpressionType() )
905+
);
906+
}
887907
else {
888908
addAssignments(
889909
(Expression) assignmentValue.accept( this ),
890-
assignedPathInterpretation.getExpressionType(),
910+
assignedPathInterpretation,
891911
targetColumnReferences,
892912
assignments,
893913
aggregateColumnAssignmentHandler
@@ -909,35 +929,18 @@ else if ( assignmentValue instanceof SqmLiteralNull<?> ) {
909929

910930
private void addAssignments(
911931
Expression valueExpression,
912-
ModelPart assignedPathType,
913-
List<? extends Expression> targetColumnReferences,
914-
ArrayList<Assignment> assignments,
915-
AggregateColumnAssignmentHandler assignmentHandler) {
916-
checkAssignment( valueExpression, assignedPathType );
917-
if ( valueExpression instanceof SqlTuple sqlTuple ) {
918-
addTupleAssignments( targetColumnReferences, assignments, assignmentHandler, sqlTuple );
919-
}
920-
else if ( valueExpression instanceof EmbeddableValuedPathInterpretation<?> embeddable ) {
921-
addTupleAssignments( targetColumnReferences, assignments, assignmentHandler, embeddable.getSqlTuple() );
922-
}
923-
else {
924-
for ( Expression columnReference : targetColumnReferences ) {
925-
addAssignment( assignments, assignmentHandler, columnReference, valueExpression );
926-
}
927-
}
928-
}
929-
930-
private void addTupleAssignments(
931-
List<? extends Expression> targetColumnReferences,
932+
SqmPathInterpretation<?> assignedPathInterpretation,
933+
List<ColumnReference> targetColumnReferences,
932934
ArrayList<Assignment> assignments,
933-
AggregateColumnAssignmentHandler aggregateColumnAssignmentHandler,
934-
SqlTuple sqlTuple) {
935-
final List<? extends Expression> expressions = sqlTuple.getExpressions();
936-
assert targetColumnReferences.size() == expressions.size();
937-
for ( int i = 0; i < targetColumnReferences.size(); i++ ) {
938-
final ColumnReference columnReference = (ColumnReference) targetColumnReferences.get( i );
939-
addAssignment( assignments, aggregateColumnAssignmentHandler, columnReference, expressions.get( i ) );
940-
}
935+
AggregateColumnAssignmentHandler aggregateColumnAssignmentHandler) {
936+
checkAssignment( valueExpression, assignedPathInterpretation.getExpressionType() );
937+
addAssignment(
938+
assignments,
939+
aggregateColumnAssignmentHandler,
940+
(Assignable) assignedPathInterpretation,
941+
targetColumnReferences,
942+
valueExpression
943+
);
941944
}
942945

943946
private void checkAssignment(Expression valueExpression, ModelPart assignedPathType) {
@@ -958,12 +961,15 @@ private void checkAssignment(Expression valueExpression, ModelPart assignedPathT
958961
private void addAssignment(
959962
List<Assignment> assignments,
960963
AggregateColumnAssignmentHandler aggregateColumnAssignmentHandler,
961-
Expression columnReference,
964+
Assignable assignable,
965+
List<ColumnReference> targetColumnReferences,
962966
Expression valueExpression) {
963967
if ( aggregateColumnAssignmentHandler != null ) {
964-
aggregateColumnAssignmentHandler.addAssignment( assignments.size(), (ColumnReference) columnReference );
968+
for ( ColumnReference targetColumnReference : targetColumnReferences ) {
969+
aggregateColumnAssignmentHandler.addAssignment( assignments.size(), targetColumnReference );
970+
}
965971
}
966-
assignments.add( new Assignment( (ColumnReference) columnReference, valueExpression ) );
972+
assignments.add( new Assignment( assignable, valueExpression ) );
967973
}
968974

969975
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import org.hibernate.metamodel.MappingMetamodel;
1212
import org.hibernate.metamodel.mapping.BasicValuedModelPart;
13+
import org.hibernate.metamodel.mapping.EntityAssociationMapping;
1314
import org.hibernate.metamodel.mapping.EntityMappingType;
1415
import org.hibernate.metamodel.mapping.MappingType;
1516
import org.hibernate.metamodel.mapping.ModelPart;
@@ -31,6 +32,8 @@
3132
import org.hibernate.sql.ast.tree.from.TableReference;
3233
import org.hibernate.sql.ast.tree.update.Assignable;
3334

35+
import org.checkerframework.checker.nullness.qual.Nullable;
36+
3437
import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
3538
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
3639
import static org.hibernate.query.sqm.internal.SqmUtil.getTargetMappingIfNeeded;
@@ -124,15 +127,37 @@ else if ( expression instanceof SqlSelectionExpression ) {
124127
}
125128

126129
private final ColumnReference columnReference;
130+
private final @Nullable String affectedTableName;
127131

128132
public BasicValuedPathInterpretation(
129133
ColumnReference columnReference,
130134
NavigablePath navigablePath,
131135
BasicValuedModelPart mapping,
132136
TableGroup tableGroup) {
137+
this( columnReference, navigablePath, mapping, tableGroup, determineAffectedTableName( tableGroup, mapping ) );
138+
}
139+
140+
private static @Nullable String determineAffectedTableName(TableGroup tableGroup, BasicValuedModelPart mapping) {
141+
final ModelPartContainer modelPart = tableGroup.getModelPart();
142+
if ( modelPart instanceof EntityAssociationMapping ) {
143+
final EntityAssociationMapping associationMapping = (EntityAssociationMapping) modelPart;
144+
if ( !associationMapping.containsTableReference( mapping.getContainingTableExpression() ) ) {
145+
return associationMapping.getAssociatedEntityMappingType().getMappedTableDetails().getTableName();
146+
}
147+
}
148+
return null;
149+
}
150+
151+
public BasicValuedPathInterpretation(
152+
ColumnReference columnReference,
153+
NavigablePath navigablePath,
154+
BasicValuedModelPart mapping,
155+
TableGroup tableGroup,
156+
@Nullable String affectedTableName) {
133157
super( navigablePath, mapping, tableGroup );
134158
assert columnReference != null;
135159
this.columnReference = columnReference;
160+
this.affectedTableName = affectedTableName;
136161
}
137162

138163
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -143,6 +168,11 @@ public Expression getSqlExpression() {
143168
return columnReference;
144169
}
145170

171+
@Override
172+
public @Nullable String getAffectedTableName() {
173+
return affectedTableName;
174+
}
175+
146176
@Override
147177
public ColumnReference getColumnReference() {
148178
return columnReference;

0 commit comments

Comments
 (0)