(shardingsphere) branch master updated: Fix wrong parameter bind logic for sql translator hint bind (#29566)

[chengzhang]

This is an automated email from the ASF dual-hosted git repository.

chengzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 98752e87803 Fix wrong parameter bind logic for sql translator hint 
bind (#29566)
98752e87803 is described below

commit 98752e87803163a1af5ba8ec854c7c94076c82b0
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Wed Dec 27 17:34:00 2023 +0800

    Fix wrong parameter bind logic for sql translator hint bind (#29566)
---
 .../shardingsphere/infra/binder/statement/dml/MergeStatementBinder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/MergeStatementBinder.java
 
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/MergeStatementBinder.java
index 53e33e8feb1..7ad3df9e534 100644
--- 
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/MergeStatementBinder.java
+++ 
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/MergeStatementBinder.java
@@ -93,7 +93,7 @@ public final class MergeStatementBinder implements 
SQLStatementBinder<MergeState
                 optional -> result.setInsert(bindMergeInsert(optional, 
(SimpleTableSegment) boundedTargetTableSegment, statementBinderContext, 
targetTableBinderContexts, sourceTableBinderContexts)));
         sqlStatement.getUpdate().ifPresent(
                 optional -> result.setUpdate(bindMergeUpdate(optional, 
(SimpleTableSegment) boundedTargetTableSegment, statementBinderContext, 
targetTableBinderContexts, sourceTableBinderContexts)));
-        addParameterMarkerSegments(sqlStatement, result);
+        addParameterMarkerSegments(result, sqlStatement);
         result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
         return result;
     }