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

Remove duplicated space before `when matched` 

Running `org.hibernate.orm.test.stateless.UpsertTest`:

Before -> `merge into "UpsertTest$Record" as t using (select cast(? as bigint) id, cast(? as varchar) message) as s on (t.id=s.id) when not matched then insert (id, message) values (s.id, s.message)  when matched then update set message=s.message`
After  -> `merge into "UpsertTest$Record" as t using (select cast(? as bigint) id, cast(? as varchar) message) as s on (t.id=s.id) when not matched then insert (id, message) values (s.id, s.message) when matched then update set message=s.message`
This commit is contained in:
Yanming Zhou 2024-08-20 17:02:45 +08:00 committed by Gavin King
parent 4cef240c5c
commit e407c53c86
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithMerge.java
View File

@ -242,7 +242,7 @@ public abstract class SqlAstTranslatorWithMerge<T extends JdbcOperation> extends
} }
private void renderWhenMatched(List<ColumnValueBinding> optimisticLockBindings) { private void renderWhenMatched(List<ColumnValueBinding> optimisticLockBindings) {
appendSql( " when matched" ); appendSql( "when matched" );
for (int i = 0; i < optimisticLockBindings.size(); i++) { for (int i = 0; i < optimisticLockBindings.size(); i++) {
final ColumnValueBinding binding = optimisticLockBindings.get( i ); final ColumnValueBinding binding = optimisticLockBindings.get( i );
appendSql(" and "); appendSql(" and ");

2
hibernate-core/src/main/java/org/hibernate/dialect/SqlAstTranslatorWithUpsert.java
View File

@ -193,7 +193,7 @@ public class SqlAstTranslatorWithUpsert<T extends JdbcOperation> extends Abstrac
final List<ColumnValueBinding> valueBindings = optionalTableUpdate.getValueBindings(); final List<ColumnValueBinding> valueBindings = optionalTableUpdate.getValueBindings();
final List<ColumnValueBinding> optimisticLockBindings = optionalTableUpdate.getOptimisticLockBindings(); final List<ColumnValueBinding> optimisticLockBindings = optionalTableUpdate.getOptimisticLockBindings();
appendSql( " when matched then update set " ); appendSql( "when matched then update set " );
for ( int i = 0; i < valueBindings.size(); i++ ) { for ( int i = 0; i < valueBindings.size(); i++ ) {
final ColumnValueBinding binding = valueBindings.get( i ); final ColumnValueBinding binding = valueBindings.get( i );
if ( i > 0 ) { if ( i > 0 ) {