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 aa2bd7e3c0d Add missing CollateExpressionBinder in
ExpressionSegmentBinder (#38006)
aa2bd7e3c0d is described below
commit aa2bd7e3c0d08fa8b56242f68d9e38315c46793c
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Feb 11 15:19:21 2026 +0800
Add missing CollateExpressionBinder in ExpressionSegmentBinder (#38006)
---
.../dml/expression/ExpressionSegmentBinder.java | 5 ++
.../expression/type/CollateExpressionBinder.java | 54 ++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/ExpressionSegmentBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/ExpressionSegmentBinder.java
index 39609173725..bf9e5f225fe 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/ExpressionSegmentBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/ExpressionSegmentBinder.java
@@ -28,6 +28,7 @@ import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.BetweenExpressionSegmentBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.BinaryOperationExpressionBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.CaseWhenExpressionBinder;
+import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.CollateExpressionBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.ColumnSegmentBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.ExistsSubqueryExpressionBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.FunctionExpressionSegmentBinder;
@@ -44,6 +45,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.Co
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.BetweenExpression;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.BinaryOperationExpression;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.CaseWhenExpression;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.CollateExpression;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExistsSubqueryExpression;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment;
@@ -127,6 +129,9 @@ public final class ExpressionSegmentBinder {
if (segment instanceof UnaryOperationExpression) {
return
UnaryOperationExpressionBinder.bind((UnaryOperationExpression) segment,
parentSegmentType, binderContext, tableBinderContexts,
outerTableBinderContexts);
}
+ if (segment instanceof CollateExpression) {
+ return CollateExpressionBinder.bind((CollateExpression) segment,
parentSegmentType, binderContext, tableBinderContexts,
outerTableBinderContexts);
+ }
// TODO support more ExpressionSegment bound
return segment;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/CollateExpressionBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/CollateExpressionBinder.java
new file mode 100644
index 00000000000..3e91fc89bc7
--- /dev/null
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/CollateExpressionBinder.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
+
+import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
+import com.google.common.collect.Multimap;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
+import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.ExpressionSegmentBinder;
+import
org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
+import
org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.CollateExpression;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
+
+/**
+ * Collate expression binder.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class CollateExpressionBinder {
+
+ /**
+ * Bind collate operation expression segment.
+ *
+ * @param segment collate operation expression
+ * @param parentSegmentType parent segment type
+ * @param binderContext SQL statement binder context
+ * @param tableBinderContexts table binder contexts
+ * @param outerTableBinderContexts outer table binder contexts
+ * @return bound collate operation expression
+ */
+ public static CollateExpression bind(final CollateExpression segment,
final SegmentType parentSegmentType,
+ final SQLStatementBinderContext
binderContext, final Multimap<CaseInsensitiveString, TableSegmentBinderContext>
tableBinderContexts,
+ final Multimap<CaseInsensitiveString,
TableSegmentBinderContext> outerTableBinderContexts) {
+ ExpressionSegment boundExpression =
+ segment.getExpr().map(optional ->
ExpressionSegmentBinder.bind(optional, parentSegmentType, binderContext,
tableBinderContexts, outerTableBinderContexts)).orElse(null);
+ return new CollateExpression(segment.getStartIndex(),
segment.getStopIndex(), segment.getCollateName(), boundExpression);
+ }
+}
