You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/01/20 00:38:30 UTC
[shardingsphere] branch master updated: Support MySQL to use `COLLATE` in whereClasue (#14920)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 8499800 Support MySQL to use `COLLATE` in whereClasue (#14920)
8499800 is described below
commit 849980034a7d371833e94d92191b3f86e80bfe95
Author: Guocheng Tang <to...@qq.com>
AuthorDate: Thu Jan 20 08:37:09 2022 +0800
Support MySQL to use `COLLATE` in whereClasue (#14920)
* Support for COLLATE and placeholders in SELECT
* update test case.
---
.../src/main/antlr4/imports/mysql/BaseRule.g4 | 6 +-
.../src/main/antlr4/imports/mysql/DALStatement.g4 | 3 +-
.../src/main/antlr4/imports/mysql/DCLStatement.g4 | 12 +-
.../impl/MySQLDDLStatementSQLVisitor.java | 10 +-
.../statement/impl/MySQLStatementSQLVisitor.java | 49 ++--
.../ddl/table/ConvertTableDefinitionSegment.java | 4 +-
.../expr/CollateExpression.java} | 10 +-
.../common/segment/dml/expr/ListExpression.java | 1 -
.../asserts/segment/charset/CollateAssert.java | 56 -----
.../segment/expression/ExpressionAssert.java | 22 +-
.../ddl/impl/AlterTableStatementAssert.java | 8 +-
.../definition/ExpectedConvertTableDefinition.java | 6 +-
...ression.java => ExpectedCollateExpression.java} | 13 +-
.../segment/impl/expr/ExpectedExpression.java | 3 +
.../simple/ExpectedParameterMarkerExpression.java | 4 +-
.../src/main/resources/case/dal/explain.xml | 8 +-
.../src/main/resources/case/dal/show.xml | 28 +--
.../src/main/resources/case/ddl/alter-table.xml | 6 +-
.../src/main/resources/case/dml/call.xml | 6 +-
.../src/main/resources/case/dml/delete.xml | 34 +--
.../src/main/resources/case/dml/insert.xml | 264 ++++++++++-----------
.../src/main/resources/case/dml/replace.xml | 152 ++++++------
.../main/resources/case/dml/select-aggregate.xml | 28 +--
.../main/resources/case/dml/select-expression.xml | 116 +++++----
.../main/resources/case/dml/select-group-by.xml | 12 +-
.../src/main/resources/case/dml/select-into.xml | 10 +-
.../src/main/resources/case/dml/select-join.xml | 6 +-
.../src/main/resources/case/dml/select-lock.xml | 14 +-
.../src/main/resources/case/dml/select-or.xml | 42 ++--
.../dml/select-pagination-group-by-order-by.xml | 144 +++++------
.../main/resources/case/dml/select-pagination.xml | 140 +++++------
.../main/resources/case/dml/select-sub-query.xml | 6 +-
.../src/main/resources/case/dml/select.xml | 192 +++++++--------
.../src/main/resources/case/dml/update.xml | 88 +++----
.../sql/supported/dml/select-expression.xml | 1 +
.../main/resources/sql/unsupported/unsupported.xml | 3 +-
36 files changed, 759 insertions(+), 748 deletions(-)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index b9ed65b..b971287 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -864,7 +864,7 @@ simpleExpr
| parameterMarker
| literals
| columnRef
- | simpleExpr COLLATE textOrIdentifier
+ | simpleExpr collateClause
| variable
| simpleExpr OR_ simpleExpr
| (PLUS_ | MINUS_ | TILDE_ | notOperator | BINARY) simpleExpr
@@ -890,7 +890,7 @@ functionCall
;
aggregationFunction
- : aggregationFunctionName LP_ distinct? (expr (COMMA_ expr)* | ASTERISK_)? RP_ overClause?
+ : aggregationFunctionName LP_ distinct? (expr (COMMA_ expr)* | ASTERISK_)? collateClause? RP_ overClause?
;
aggregationFunctionName
@@ -1240,7 +1240,7 @@ characterSet
;
collateClause
- : COLLATE collationName
+ : COLLATE (collationName | parameterMarker)
;
fieldOrVarSpec
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
index ca974c7..2a0bda0 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DALStatement.g4
@@ -311,6 +311,7 @@ checkTableOption
checksumTable
: CHECKSUM tableOrTables tableList (QUICK | EXTENDED)?
;
+
optimizeTable
: OPTIMIZE (NO_WRITE_TO_BINLOG | LOCAL)? tableOrTables tableList
;
@@ -330,7 +331,7 @@ vcpuSpec
createResourceGroup
: CREATE RESOURCE GROUP groupName TYPE EQ_ (SYSTEM | USER) (VCPU EQ_? vcpuSpec (COMMA_ vcpuSpec)*)?
- (THREAD_PRIORITY EQ_? NUMBER_)? (ENABLE | DISABLE )?
+ (THREAD_PRIORITY EQ_? NUMBER_)? (ENABLE | DISABLE)?
;
dropResourceGroup
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
index bdf8a4a..5398c67 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/DCLStatement.g4
@@ -135,9 +135,9 @@ accountLockPasswordExpireOption
;
alterUser
- : ALTER USER (IF EXISTS)? alterUserList requireClause? connectOptions? accountLockPasswordExpireOptions?
- | ALTER USER (IF EXISTS)? USER LP_ RP_ userFuncAuthOption
- | ALTER USER (IF EXISTS)? username DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*)
+ : ALTER USER existClause? alterUserList requireClause? connectOptions? accountLockPasswordExpireOptions?
+ | ALTER USER existClause? USER LP_ RP_ userFuncAuthOption
+ | ALTER USER existClause? username DEFAULT ROLE (NONE | ALL | roleName (COMMA_ roleName)*)
;
alterUserEntry
@@ -149,15 +149,15 @@ alterUserList
;
dropUser
- : DROP USER (IF EXISTS)? username (COMMA_ username)*
+ : DROP USER existClause? username (COMMA_ username)*
;
createRole
- : CREATE ROLE (IF NOT EXISTS)? roleName (COMMA_ roleName)*
+ : CREATE ROLE notExistClause? roleName (COMMA_ roleName)*
;
dropRole
- : DROP ROLE (IF EXISTS)? roleName (COMMA_ roleName)*
+ : DROP ROLE existClause? roleName (COMMA_ roleName)*
;
renameUser
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
index e0ea10c..88cb960 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
@@ -46,7 +46,6 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.BeginSt
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CaseStatementContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ChangeColumnContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CharsetNameContext;
-import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CollationNameContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ColumnDefinitionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CompoundStatementContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CreateDatabaseContext;
@@ -96,7 +95,6 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.WhileSt
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.AlterDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.CreateDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset.CharsetNameSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset.CollateClauseSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.column.ColumnDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.column.alter.AddColumnDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.column.alter.ChangeColumnDefinitionSegment;
@@ -116,6 +114,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.routine.Valid
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.table.ConvertTableDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.table.RenameTableDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DataTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -346,17 +345,12 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
public ASTNode visitAlterConvert(final AlterConvertContext ctx) {
ConvertTableDefinitionSegment result = new ConvertTableDefinitionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (CharsetNameSegment) visit(ctx.charsetName()));
if (null != ctx.collateClause()) {
- result.setCollateClause((CollateClauseSegment) visit(ctx.collateClause()));
+ result.setCollateValue((SimpleExpressionSegment) visit(ctx.collateClause()));
}
return result;
}
@Override
- public ASTNode visitCollationName(final CollationNameContext ctx) {
- return new CollateClauseSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.getText());
- }
-
- @Override
public ASTNode visitCharsetName(final CharsetNameContext ctx) {
return new CharsetNameSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.getText());
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index 6488c3e..35f06ee 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -25,7 +25,6 @@ import org.antlr.v4.runtime.misc.Interval;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementBaseVisitor;
-import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AggregationFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AliasContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AssignmentContext;
@@ -38,6 +37,7 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.Boolean
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.BooleanPrimaryContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CastFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CharFunctionContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CollateClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ColumnNameContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ColumnNamesContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ColumnRefContext;
@@ -73,6 +73,7 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LimitCl
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LimitOffsetContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LimitRowCountContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LiteralsContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LockClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LockClauseListContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.MatchExpressionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.MultipleTablesClauseContext;
@@ -112,7 +113,9 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.String_
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SubqueryContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SubstringFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableAliasRefListContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableFactorContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableIdentOptWildContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableListContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableNameContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableReferenceContext;
@@ -144,6 +147,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.Insert
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.OnDuplicateKeyColumnsSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BetweenExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.CollateExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExistsSubqueryExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.FunctionSegment;
@@ -153,6 +157,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.NotExpre
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.complex.CommonExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.LiteralExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.subquery.SubqueryExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.subquery.SubquerySegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.AggregationDistinctProjectionSegment;
@@ -547,6 +552,10 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
if (null != ctx.functionCall()) {
return visit(ctx.functionCall());
}
+ if (null != ctx.collateClause()) {
+ SimpleExpressionSegment collateValueSegment = (SimpleExpressionSegment) visit(ctx.collateClause());
+ return new CollateExpression(startIndex, stopIndex, collateValueSegment);
+ }
if (null != ctx.columnRef()) {
return visit(ctx.columnRef());
}
@@ -604,7 +613,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public ASTNode visitLockClauseList(final LockClauseListContext ctx) {
LockSegment result = new LockSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex());
- for (MySQLStatementParser.LockClauseContext each : ctx.lockClause()) {
+ for (LockClauseContext each : ctx.lockClause()) {
if (null != each.tableLockingList()) {
result.getTables().addAll(generateTablesFromTableAliasRefList(each.tableLockingList().tableAliasRefList()));
}
@@ -1057,9 +1066,9 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
return result;
}
- private Collection<InsertValuesSegment> createInsertValuesSegments(final Collection<MySQLStatementParser.AssignmentValuesContext> assignmentValuesContexts) {
+ private Collection<InsertValuesSegment> createInsertValuesSegments(final Collection<AssignmentValuesContext> assignmentValuesContexts) {
Collection<InsertValuesSegment> result = new LinkedList<>();
- for (MySQLStatementParser.AssignmentValuesContext each : assignmentValuesContexts) {
+ for (AssignmentValuesContext each : assignmentValuesContexts) {
result.add((InsertValuesSegment) visit(each));
}
return result;
@@ -1068,7 +1077,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public ASTNode visitOnDuplicateKeyClause(final OnDuplicateKeyClauseContext ctx) {
Collection<AssignmentSegment> columns = new LinkedList<>();
- for (MySQLStatementParser.AssignmentContext each : ctx.assignment()) {
+ for (AssignmentContext each : ctx.assignment()) {
columns.add((AssignmentSegment) visit(each));
}
return new OnDuplicateKeyColumnsSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), columns);
@@ -1136,9 +1145,9 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
return result;
}
- private Collection<InsertValuesSegment> createReplaceValuesSegments(final Collection<MySQLStatementParser.AssignmentValuesContext> assignmentValuesContexts) {
+ private Collection<InsertValuesSegment> createReplaceValuesSegments(final Collection<AssignmentValuesContext> assignmentValuesContexts) {
Collection<InsertValuesSegment> result = new LinkedList<>();
- for (MySQLStatementParser.AssignmentValuesContext each : assignmentValuesContexts) {
+ for (AssignmentValuesContext each : assignmentValuesContexts) {
result.add((InsertValuesSegment) visit(each));
}
return result;
@@ -1166,7 +1175,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public ASTNode visitSetAssignmentsClause(final SetAssignmentsClauseContext ctx) {
Collection<AssignmentSegment> assignments = new LinkedList<>();
- for (MySQLStatementParser.AssignmentContext each : ctx.assignment()) {
+ for (AssignmentContext each : ctx.assignment()) {
assignments.add((AssignmentSegment) visit(each));
}
return new SetAssignmentSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), assignments);
@@ -1175,7 +1184,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
@Override
public ASTNode visitAssignmentValues(final AssignmentValuesContext ctx) {
List<ExpressionSegment> segments = new LinkedList<>();
- for (MySQLStatementParser.AssignmentValueContext each : ctx.assignmentValue()) {
+ for (AssignmentValueContext each : ctx.assignmentValue()) {
segments.add((ExpressionSegment) visit(each));
}
return new InsertValuesSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), segments);
@@ -1251,7 +1260,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
private List<SimpleTableSegment> generateTablesFromTableAliasRefList(final TableAliasRefListContext ctx) {
List<SimpleTableSegment> result = new LinkedList<>();
- for (MySQLStatementParser.TableIdentOptWildContext each : ctx.tableIdentOptWild()) {
+ for (TableIdentOptWildContext each : ctx.tableIdentOptWild()) {
result.add((SimpleTableSegment) visit(each.tableName()));
}
return result;
@@ -1276,7 +1285,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
private boolean isDistinct(final QuerySpecificationContext ctx) {
- for (MySQLStatementParser.SelectSpecificationContext each : ctx.selectSpecification()) {
+ for (SelectSpecificationContext each : ctx.selectSpecification()) {
if (((BooleanLiteralValue) visit(each)).getValue()) {
return true;
}
@@ -1307,7 +1316,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
if (null != ctx.unqualifiedShorthand()) {
projections.add(new ShorthandProjectionSegment(ctx.unqualifiedShorthand().getStart().getStartIndex(), ctx.unqualifiedShorthand().getStop().getStopIndex()));
}
- for (MySQLStatementParser.ProjectionContext each : ctx.projection()) {
+ for (ProjectionContext each : ctx.projection()) {
projections.add((ProjectionSegment) visit(each));
}
ProjectionsSegment result = new ProjectionsSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex());
@@ -1437,7 +1446,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
TableSegment result;
TableSegment left;
left = (TableSegment) visit(ctx.tableFactor());
- for (MySQLStatementParser.JoinedTableContext each : ctx.joinedTable()) {
+ for (JoinedTableContext each : ctx.joinedTable()) {
left = visitJoinedTable(each, left);
}
result = left;
@@ -1449,7 +1458,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
TableSegment result;
TableSegment left;
left = null != ctx.tableFactor() ? (TableSegment) visit(ctx.tableFactor()) : (TableSegment) visit(ctx.escapedTableReference());
- for (MySQLStatementParser.JoinedTableContext each : ctx.joinedTable()) {
+ for (JoinedTableContext each : ctx.joinedTable()) {
left = visitJoinedTable(each, left);
}
result = left;
@@ -1516,7 +1525,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
if (null != ctx.USING()) {
List<ColumnSegment> columnSegmentList = new LinkedList<>();
- for (MySQLStatementParser.ColumnNameContext cname : ctx.columnNames().columnName()) {
+ for (ColumnNameContext cname : ctx.columnNames().columnName()) {
columnSegmentList.add((ColumnSegment) visit(cname));
}
joinTableSource.setUsing(columnSegmentList);
@@ -1578,13 +1587,21 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
}
@Override
- public ASTNode visitTable(final MySQLStatementParser.TableContext ctx) {
+ public ASTNode visitTable(final TableContext ctx) {
MySQLTableStatement result = new MySQLTableStatement();
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
result.setColumn((ColumnSegment) visit(ctx.columnName()));
result.setLimit((LimitSegment) visit(ctx.limitClause()));
return result;
}
+
+ @Override
+ public ASTNode visitCollateClause(final CollateClauseContext ctx) {
+ if (null != ctx.collationName()) {
+ return new LiteralExpressionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.collationName().textOrIdentifier().getText());
+ }
+ return new ParameterMarkerExpressionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ((ParameterMarkerValue) visit(ctx.parameterMarker())).getValue());
+ }
/**
* Get original text.
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/table/ConvertTableDefinitionSegment.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/table/ConvertTableDefinitionSegment.java
index 7c2b734..4ad8dd8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/table/ConvertTableDefinitionSegment.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/table/ConvertTableDefinitionSegment.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.AlterDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset.CharsetNameSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset.CollateClauseSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
/**
* Convert table definition segment.
@@ -38,5 +38,5 @@ public final class ConvertTableDefinitionSegment implements AlterDefinitionSegme
private final CharsetNameSegment charsetName;
- private CollateClauseSegment collateClause;
+ private SimpleExpressionSegment collateValue;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/charset/CollateClauseSegment.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
similarity index 80%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/charset/CollateClauseSegment.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
index 420e926..8c42d5b 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/charset/CollateClauseSegment.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset;
+package org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.SQLSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
/**
- * Collate clause segment.
+ * Collate expression.
*/
@RequiredArgsConstructor
@Getter
-public final class CollateClauseSegment implements SQLSegment {
+public final class CollateExpression implements ExpressionSegment {
private final int startIndex;
private final int stopIndex;
- private final String name;
+ private final SimpleExpressionSegment collateName;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/ListExpression.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/ListExpression.java
index 20b7d9e..3523b9a 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/ListExpression.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/ListExpression.java
@@ -35,4 +35,3 @@ public final class ListExpression implements ExpressionSegment {
private final List<ExpressionSegment> items = new LinkedList<>();
}
-
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/charset/CollateAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/charset/CollateAssert.java
deleted file mode 100644
index d46b854..0000000
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/charset/CollateAssert.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.test.sql.parser.parameterized.asserts.segment.charset;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.charset.CollateClauseSegment;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.SQLSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.charset.ExpectedCollate;
-
-import java.util.Optional;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Collate assert.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class CollateAssert {
-
- /**
- * Assert actual collate segment is correct with expected column.
- *
- * @param assertContext assert context
- * @param actual actual collate segment
- * @param expected expected collate
- */
- public static void assertIs(final SQLCaseAssertContext assertContext, final CollateClauseSegment actual, final ExpectedCollate expected) {
- if (null != expected) {
- assertTrue(assertContext.getText("Actual collate should exist."), Optional.ofNullable(actual).isPresent());
- assertThat(assertContext.getText("collate assertion error. "), actual.getName(), is(expected.getName()));
- SQLSegmentAssert.assertIs(assertContext, actual, expected);
- } else {
- assertFalse(assertContext.getText("Actual collate should not exist."), Optional.ofNullable(actual).isPresent());
- }
- }
-}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/expression/ExpressionAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/expression/ExpressionAssert.java
index 179010b..f5ba396 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/expression/ExpressionAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/expression/ExpressionAssert.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BetweenExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.CollateExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExistsSubqueryExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.FunctionSegment;
@@ -46,6 +47,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.p
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.dml.impl.SelectStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedBetweenExpression;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedBinaryOperationExpression;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedCollateExpression;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedExistsSubquery;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedExpression;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedInExpression;
@@ -84,7 +86,7 @@ public final class ExpressionAssert {
assertNull(assertContext.getText("Actual parameter marker expression should not exist."), actual);
} else {
assertNotNull(assertContext.getText("Actual parameter marker expression should exist."), actual);
- assertThat(assertContext.getText("Parameter marker index assertion error: "), actual.getParameterMarkerIndex(), is(expected.getValue()));
+ assertThat(assertContext.getText("Parameter marker index assertion error: "), actual.getParameterMarkerIndex(), is(expected.getParameterIndex()));
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
}
@@ -305,6 +307,22 @@ public final class ExpressionAssert {
OwnerAssert.assertIs(assertContext, actual.getOwner(), expected.getOwner());
}
}
+
+ /**
+ * Assert collate.
+ *
+ * @param assertContext assert context
+ * @param actual actual collate expression
+ * @param expected expected collate expression
+ */
+ public static void assertCollateExpression(final SQLCaseAssertContext assertContext, final CollateExpression actual, final ExpectedCollateExpression expected) {
+ if (null == expected) {
+ assertNull(assertContext.getText("Actual collate expression should not exist."), actual);
+ } else {
+ assertExpression(assertContext, actual.getCollateName(), expected.getCollateName());
+ SQLSegmentAssert.assertIs(assertContext, actual, expected);
+ }
+ }
/**
* Assert expression by actual expression segment class type.
@@ -363,6 +381,8 @@ public final class ExpressionAssert {
(AggregationProjectionSegment) actual, expected.getAggregationProjection());
} else if (actual instanceof FunctionSegment) {
assertFunction(assertContext, (FunctionSegment) actual, expected.getFunction());
+ } else if (actual instanceof CollateExpression) {
+ assertCollateExpression(assertContext, (CollateExpression) actual, expected.getCollateExpression());
} else {
throw new UnsupportedOperationException(
String.format("Unsupported expression : %s.", actual.getClass().getName()));
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AlterTableStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AlterTableStatementAssert.java
index 91664c4..274e17e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AlterTableStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AlterTableStatementAssert.java
@@ -32,11 +32,11 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterTableS
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.charset.CharsetAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.charset.CollateAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.column.ColumnAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.definition.ColumnDefinitionAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.definition.ColumnPositionAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.definition.ConstraintDefinitionAssert;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.table.TableAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.definition.ExpectedAddColumnDefinition;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.definition.ExpectedChangeColumnDefinition;
@@ -85,7 +85,11 @@ public final class AlterTableStatementAssert {
if (null != expected.getConvertTable()) {
assertTrue(assertContext.getText("Actual convert table segment should exist."), convertTable.isPresent());
CharsetAssert.assertIs(assertContext, convertTable.get().getCharsetName(), expected.getConvertTable().getCharsetName());
- CollateAssert.assertIs(assertContext, convertTable.get().getCollateClause(), expected.getConvertTable().getCollate());
+ if (null != expected.getConvertTable().getCollateExpression()) {
+ ExpressionAssert.assertExpression(assertContext, convertTable.get().getCollateValue(), expected.getConvertTable().getCollateExpression().getCollateName());
+ } else {
+ assertNull(assertContext.getText("Actual collate expression should not exist."), convertTable.get().getCollateValue());
+ }
SQLSegmentAssert.assertIs(assertContext, convertTable.get(), expected.getConvertTable());
} else {
assertFalse(assertContext.getText("Actual convert table segment should not exist."), convertTable.isPresent());
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/definition/ExpectedConvertTableDefinition.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/definition/ExpectedConvertTableDefinition.java
index 63f58d1..82a5b69 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/definition/ExpectedConvertTableDefinition.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/definition/ExpectedConvertTableDefinition.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.AbstractExpectedSQLSegment;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.charset.ExpectedCharsetName;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.charset.ExpectedCollate;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.ExpectedCollateExpression;
import javax.xml.bind.annotation.XmlElement;
@@ -35,6 +35,6 @@ public final class ExpectedConvertTableDefinition extends AbstractExpectedSQLSeg
@XmlElement(name = "charset")
private ExpectedCharsetName charsetName;
- @XmlElement(name = "collate")
- private ExpectedCollate collate;
+ @XmlElement(name = "collate-expression")
+ private ExpectedCollateExpression collateExpression;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedCollateExpression.java
similarity index 70%
copy from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java
copy to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedCollateExpression.java
index 28b8f87..37a9f70 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedCollateExpression.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr.simple;
+package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.expr;
import lombok.Getter;
import lombok.Setter;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.AbstractExpectedSQLSegment;
-import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
/**
- * Expected parameter marker expression.
+ * Expected expression.
*/
@Getter
@Setter
-public final class ExpectedParameterMarkerExpression extends ExpectedBaseSimpleExpression {
+public final class ExpectedCollateExpression extends AbstractExpectedSQLSegment {
- @XmlAttribute
- private int value;
+ @XmlElement(name = "collate-name")
+ private ExpectedExpression collateName;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedExpression.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedExpression.java
index 727a283..7751c0d 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedExpression.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/ExpectedExpression.java
@@ -83,4 +83,7 @@ public final class ExpectedExpression extends AbstractExpectedSQLSegment {
@XmlElement(name = "aggregation-projection")
private ExpectedAggregationProjection aggregationProjection;
+
+ @XmlElement(name = "collate-expression")
+ private ExpectedCollateExpression collateExpression;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java
index 28b8f87..a43420f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/expr/simple/ExpectedParameterMarkerExpression.java
@@ -29,6 +29,6 @@ import javax.xml.bind.annotation.XmlAttribute;
@Setter
public final class ExpectedParameterMarkerExpression extends ExpectedBaseSimpleExpression {
- @XmlAttribute
- private int value;
+ @XmlAttribute(name = "parameter-index")
+ private int parameterIndex;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/explain.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/explain.xml
index b9dfb31..3979065 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/explain.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/explain.xml
@@ -52,15 +52,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" />
+ <parameter-marker-expression parameter-index="0" />
<literal-expression value="1" start-index="64" stop-index="64" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" />
+ <parameter-marker-expression parameter-index="1" />
<literal-expression value="1" start-index="67" stop-index="67" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" />
+ <parameter-marker-expression parameter-index="2" />
<literal-expression value="insert" start-index="70" stop-index="77" />
</assignment-value>
</value>
@@ -80,7 +80,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="41" stop-index="46" />
- <parameter-marker-expression value="0" start-index="41" stop-index="41" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="41" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/show.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/show.xml
index 70dadaf..71d8505 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/show.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dal/show.xml
@@ -82,7 +82,7 @@
<operator>=</operator>
<right>
<literal-expression value="order_id" start-index="42" stop-index="51" />
- <parameter-marker-expression value="0" start-index="42" stop-index="42" />
+ <parameter-marker-expression parameter-index="0" start-index="42" stop-index="42" />
</right>
</binary-operation-expression>
</expr>
@@ -124,7 +124,7 @@
<operator>=</operator>
<right>
<literal-expression value="order_id" start-index="41" stop-index="50" />
- <parameter-marker-expression value="0" start-index="41" stop-index="41" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="41" />
</right>
</binary-operation-expression>
</expr>
@@ -169,7 +169,7 @@
<operator>=</operator>
<right>
<literal-expression value="sharding_db" start-index="34" stop-index="46" />
- <parameter-marker-expression value="0" start-index="34" stop-index="34" />
+ <parameter-marker-expression parameter-index="0" start-index="34" stop-index="34" />
</right>
</binary-operation-expression>
</expr>
@@ -214,7 +214,7 @@
<operator>=</operator>
<right>
<literal-expression value="function1" start-index="34" stop-index="44" />
- <parameter-marker-expression value="0" start-index="34" stop-index="34" />
+ <parameter-marker-expression parameter-index="0" start-index="34" stop-index="34" />
</right>
</binary-operation-expression>
</expr>
@@ -259,7 +259,7 @@
<operator>=</operator>
<right>
<literal-expression value="procedure1" start-index="35" stop-index="46" />
- <parameter-marker-expression value="0" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
</right>
</binary-operation-expression>
</expr>
@@ -337,7 +337,7 @@
<operator>=</operator>
<right>
<literal-expression value="t_order" start-index="52" stop-index="60" />
- <parameter-marker-expression value="0" start-index="52" stop-index="52" />
+ <parameter-marker-expression parameter-index="0" start-index="52" stop-index="52" />
</right>
</binary-operation-expression>
</expr>
@@ -409,7 +409,7 @@
<operator>=</operator>
<right>
<literal-expression value="t_order" start-index="49" stop-index="57" />
- <parameter-marker-expression value="0" start-index="49" stop-index="49" />
+ <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49" />
</right>
</binary-operation-expression>
</expr>
@@ -475,7 +475,7 @@
<operator>=</operator>
<right>
<literal-expression value="t_order" start-index="52" stop-index="60" />
- <parameter-marker-expression value="0" start-index="52" stop-index="52" />
+ <parameter-marker-expression parameter-index="0" start-index="52" stop-index="52" />
</right>
</binary-operation-expression>
</expr>
@@ -526,7 +526,7 @@
<operator>=</operator>
<right>
<literal-expression value="open_tables" start-index="41" stop-index="53" />
- <parameter-marker-expression value="0" start-index="41" stop-index="41" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="41" />
</right>
</binary-operation-expression>
</expr>
@@ -595,7 +595,7 @@
<operator>=</operator>
<right>
<literal-expression value="sharding_db" start-index="42" stop-index="54" />
- <parameter-marker-expression value="0" start-index="42" stop-index="42" />
+ <parameter-marker-expression parameter-index="0" start-index="42" stop-index="42" />
</right>
</binary-operation-expression>
</expr>
@@ -664,7 +664,7 @@
<operator>=</operator>
<right>
<literal-expression value="BASE TABLE" start-index="66" stop-index="77" />
- <parameter-marker-expression value="0" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="0" start-index="66" stop-index="66" />
</right>
</binary-operation-expression>
</expr>
@@ -712,7 +712,7 @@
<operator>=</operator>
<right>
<literal-expression value="latin1" start-index="37" stop-index="44" />
- <parameter-marker-expression value="0" start-index="37" stop-index="37" />
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="37" />
</right>
</binary-operation-expression>
</expr>
@@ -757,7 +757,7 @@
<operator>=</operator>
<right>
<literal-expression value="latin1" start-index="31" stop-index="38" />
- <parameter-marker-expression value="0" start-index="31" stop-index="31" />
+ <parameter-marker-expression parameter-index="0" start-index="31" stop-index="31" />
</right>
</binary-operation-expression>
</expr>
@@ -806,7 +806,7 @@
<operator>=</operator>
<right>
<literal-expression value="max_join_size" start-index="44" stop-index="58" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-table.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-table.xml
index 7c87afc..b4c58b1 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-table.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-table.xml
@@ -1149,7 +1149,11 @@
<table name="t1" start-index="12" stop-index="13"/>
<convert-table start-index="15" stop-index="65">
<charset name="DEFAULT" start-index="40" stop-index="46" />
- <collate name="cp1251_bin" start-index="56" stop-index="65" />
+ <collate-expression start-index="28" stop-index="45" literal-stop-index="64">
+ <collate-name>
+ <literal-expression value="cp1251_bin" start-index="48" stop-index="65"/>
+ </collate-name>
+ </collate-expression>
</convert-table>
</alter-table>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/call.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/call.xml
index 37935e3..1374b8e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/call.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/call.xml
@@ -38,10 +38,10 @@
<procedure-name name="p" start-index="5" stop-index="6"/>
<parameters>
<parameter>
- <parameter-marker-expression value="0" start-index="7" stop-index="7"/>
+ <parameter-marker-expression parameter-index="0" start-index="7" stop-index="7"/>
</parameter>
<parameter>
- <parameter-marker-expression value="1" start-index="10" stop-index="10"/>
+ <parameter-marker-expression parameter-index="1" start-index="10" stop-index="10"/>
</parameter>
</parameters>
</call>
@@ -68,7 +68,7 @@
<literal-expression value="user" start-index="18" stop-index="23"/>
</parameter>
<parameter>
- <parameter-marker-expression value="0" start-index="26" stop-index="26"/>
+ <parameter-marker-expression parameter-index="0" start-index="26" stop-index="26"/>
</parameter>
</parameters>
</call>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/delete.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/delete.xml
index 1ad0f78..84f7e9e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/delete.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/delete.xml
@@ -32,7 +32,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="37" stop-index="40" />
- <parameter-marker-expression value="0" start-index="37" stop-index="37" />
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="37" />
</right>
</binary-operation-expression>
</left>
@@ -45,7 +45,7 @@
<operator>=</operator>
<right>
<literal-expression value="1001" start-index="56" stop-index="59" />
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</right>
@@ -60,7 +60,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="72" stop-index="77" />
- <parameter-marker-expression value="2" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="2" start-index="66" stop-index="66" />
</right>
</binary-operation-expression>
</right>
@@ -80,7 +80,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="33" stop-index="38" />
- <parameter-marker-expression value="0" start-index="33" stop-index="33" />
+ <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
</right>
</binary-operation-expression>
</expr>
@@ -115,7 +115,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="38" stop-index="43" />
- <parameter-marker-expression value="0" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
</right>
</binary-operation-expression>
</expr>
@@ -169,7 +169,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="37" stop-index="40" />
- <parameter-marker-expression value="0" start-index="37" stop-index="37" />
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="37" />
</right>
</binary-operation-expression>
</left>
@@ -182,7 +182,7 @@
<operator>=</operator>
<right>
<literal-expression value="1001" start-index="56" stop-index="59" />
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</right>
@@ -197,7 +197,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="72" stop-index="77" />
- <parameter-marker-expression value="2" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="2" start-index="66" stop-index="66" />
</right>
</binary-operation-expression>
</right>
@@ -238,7 +238,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="125" stop-index="128" />
- <parameter-marker-expression value="0" start-index="125" stop-index="125" />
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
</right>
</binary-operation-expression>
</expr>
@@ -267,7 +267,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="95" stop-index="98" />
- <parameter-marker-expression value="0" start-index="95" stop-index="95" />
+ <parameter-marker-expression parameter-index="0" start-index="95" stop-index="95" />
</right>
</binary-operation-expression>
</expr>
@@ -295,7 +295,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="78" stop-index="81" />
- <parameter-marker-expression value="0" start-index="78" stop-index="78" />
+ <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78" />
</right>
</binary-operation-expression>
</expr>
@@ -314,7 +314,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="54" stop-index="57" />
- <parameter-marker-expression value="0" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="0" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
</expr>
@@ -332,7 +332,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="45" stop-index="48" />
- <parameter-marker-expression value="0" start-index="45" stop-index="45" />
+ <parameter-marker-expression parameter-index="0" start-index="45" stop-index="45" />
</right>
</binary-operation-expression>
</expr>
@@ -350,7 +350,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="53" stop-index="56" />
- <parameter-marker-expression value="0" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="0" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</expr>
@@ -463,7 +463,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="124" stop-index="124" />
- <parameter-marker-expression value="0" start-index="124" stop-index="124" />
+ <parameter-marker-expression parameter-index="0" start-index="124" stop-index="124" />
</right>
</binary-operation-expression>
</right>
@@ -486,7 +486,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="138" stop-index="138" />
- <parameter-marker-expression value="0" start-index="138" stop-index="138" />
+ <parameter-marker-expression parameter-index="0" start-index="138" stop-index="138" />
</right>
</binary-operation-expression>
</expr>
@@ -506,7 +506,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="37" stop-index="40" />
- <parameter-marker-expression value="0" start-index="37" stop-index="37" />
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="37" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/insert.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/insert.xml
index a04b18c..cc69ea8 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/insert.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/insert.xml
@@ -27,15 +27,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="62" stop-index="62" />
+ <parameter-marker-expression parameter-index="2" start-index="62" stop-index="62" />
<literal-expression value="init" start-index="62" stop-index="67" />
</assignment-value>
</value>
@@ -54,15 +54,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="85" stop-index="85" />
+ <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85" />
<literal-expression value="1" start-index="85" stop-index="85" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="88" stop-index="88" />
+ <parameter-marker-expression parameter-index="1" start-index="88" stop-index="88" />
<literal-expression value="1" start-index="88" stop-index="88" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="91" stop-index="91" />
+ <parameter-marker-expression parameter-index="2" start-index="91" stop-index="91" />
<literal-expression value="init" start-index="91" stop-index="96" />
</assignment-value>
<assignment-value>
@@ -85,15 +85,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" />
+ <parameter-marker-expression parameter-index="0" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" />
+ <parameter-marker-expression parameter-index="1" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" />
+ <parameter-marker-expression parameter-index="2" />
<literal-expression value="insert" start-index="62" stop-index="69" />
</assignment-value>
</value>
@@ -109,11 +109,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="38" stop-index="38"/>
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38"/>
<literal-expression value="1" start-index="38" stop-index="38" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="41" stop-index="41"/>
+ <parameter-marker-expression parameter-index="1" start-index="41" stop-index="41"/>
<literal-expression value="1" start-index="41" stop-index="41" />
</assignment-value>
</value>
@@ -185,15 +185,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" />
+ <parameter-marker-expression parameter-index="0" />
<literal-expression value="1" start-index="77" stop-index="77" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" />
+ <parameter-marker-expression parameter-index="1" />
<literal-expression value="1" start-index="80" stop-index="80" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" />
+ <parameter-marker-expression parameter-index="2" />
<literal-expression value="insert" start-index="83" stop-index="90" />
</assignment-value>
</value>
@@ -217,15 +217,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="80" stop-index="80" />
+ <parameter-marker-expression parameter-index="0" start-index="80" stop-index="80" />
<literal-expression value="1" start-index="80" stop-index="80" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="83" stop-index="83" />
+ <parameter-marker-expression parameter-index="1" start-index="83" stop-index="83" />
<literal-expression value="1" start-index="83" stop-index="83" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="86" stop-index="86" />
+ <parameter-marker-expression parameter-index="2" start-index="86" stop-index="86" />
<literal-expression value="init" start-index="86" stop-index="91" />
</assignment-value>
</value>
@@ -238,15 +238,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="28" stop-index="28" />
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
<literal-expression value="1" start-index="28" stop-index="28" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="31" stop-index="31" />
+ <parameter-marker-expression parameter-index="1" start-index="31" stop-index="31" />
<literal-expression value="1" start-index="31" stop-index="31" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="34" stop-index="34" />
+ <parameter-marker-expression parameter-index="2" start-index="34" stop-index="34" />
<literal-expression value="init" start-index="34" stop-index="39" />
</assignment-value>
</value>
@@ -259,21 +259,21 @@
<assignment>
<column name="order_id" start-index="24" stop-index="31" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
<literal-expression value="1" literal-start-index="35" literal-stop-index="35"/>
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="38" stop-index="44" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="1" start-index="48" stop-index="48" />
<literal-expression value="1" literal-start-index="48" literal-stop-index="48" />
</assignment-value>
</assignment>
<assignment>
<column name="status" start-index="51" stop-index="56" />
<assignment-value>
- <parameter-marker-expression value="2" start-index="60" stop-index="60" />
+ <parameter-marker-expression parameter-index="2" start-index="60" stop-index="60" />
<literal-expression value="init" literal-start-index="60" literal-stop-index="65" />
</assignment-value>
</assignment>
@@ -290,11 +290,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
@@ -310,14 +310,14 @@
<assignment>
<column name="order_id" start-index="24" stop-index="31" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
<literal-expression value="1" start-index="35" stop-index="35" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="38" stop-index="44" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="1" start-index="48" stop-index="48" />
<literal-expression value="1" start-index="48" stop-index="48" />
</assignment-value>
</assignment>
@@ -342,15 +342,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="84" stop-index="84" />
+ <parameter-marker-expression parameter-index="0" start-index="84" stop-index="84" />
<literal-expression value="10000" start-index="84" stop-index="88" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="87" stop-index="87" />
+ <parameter-marker-expression parameter-index="1" start-index="87" stop-index="87" />
<literal-expression value="1000" start-index="91" stop-index="94" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="90" stop-index="90" />
+ <parameter-marker-expression parameter-index="2" start-index="90" stop-index="90" />
<literal-expression value="10" start-index="97" stop-index="98" />
</assignment-value>
<assignment-value>
@@ -374,11 +374,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="75" stop-index="75" />
+ <parameter-marker-expression parameter-index="0" start-index="75" stop-index="75" />
<literal-expression value="1000" start-index="75" stop-index="78" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="78" stop-index="78" />
+ <parameter-marker-expression parameter-index="1" start-index="78" stop-index="78" />
<literal-expression value="10" start-index="81" stop-index="82" />
</assignment-value>
<assignment-value>
@@ -397,21 +397,21 @@
<assignment>
<column name="item_id" start-index="29" stop-index="35" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
<literal-expression value="10000" start-index="39" stop-index="43" />
</assignment-value>
</assignment>
<assignment>
<column name="order_id" start-index="42" stop-index="49" literal-start-index="46" literal-stop-index="53" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
<literal-expression value="1000" start-index="57" stop-index="60" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="56" stop-index="62" literal-start-index="63" literal-stop-index="69" />
<assignment-value>
- <parameter-marker-expression value="2" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="2" start-index="66" stop-index="66" />
<literal-expression value="10" start-index="73" stop-index="74" />
</assignment-value>
</assignment>
@@ -436,14 +436,14 @@
<assignment>
<column name="order_id" start-index="29" stop-index="36" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="40" stop-index="40" />
+ <parameter-marker-expression parameter-index="0" start-index="40" stop-index="40" />
<literal-expression value="1000" start-index="40" stop-index="43" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="43" stop-index="49" literal-start-index="46" literal-stop-index="52" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
<literal-expression value="10" start-index="56" stop-index="57" />
</assignment-value>
</assignment>
@@ -472,15 +472,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="62" stop-index="62" />
+ <parameter-marker-expression parameter-index="2" start-index="62" stop-index="62" />
<literal-expression value="init" start-index="62" stop-index="67" />
</assignment-value>
</value>
@@ -509,15 +509,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="62" stop-index="62" />
+ <parameter-marker-expression parameter-index="2" start-index="62" stop-index="62" />
<literal-expression value="init" start-index="62" stop-index="67" />
</assignment-value>
</value>
@@ -526,7 +526,7 @@
<assignment start-index="89" stop-index="98" literal-start-index="94" literal-stop-index="108">
<column name="status" start-index="89" stop-index="94" literal-start-index="94" literal-stop-index="99" />
<assignment-value>
- <parameter-marker-expression value="3" start-index="98" stop-index="98" />
+ <parameter-marker-expression parameter-index="3" start-index="98" stop-index="98" />
<literal-expression value="init" start-index="103" stop-index="108" />
</assignment-value>
</assignment>
@@ -541,7 +541,7 @@
<owner name="t_order" start-index="24" stop-index="30" />
</column>
<assignment-value>
- <parameter-marker-expression value="0" start-index="43" stop-index="43" />
+ <parameter-marker-expression parameter-index="0" start-index="43" stop-index="43" />
<literal-expression value="1" start-index="43" stop-index="43" />
</assignment-value>
</assignment>
@@ -550,7 +550,7 @@
<owner name="t_order" start-index="46" stop-index="52" />
</column>
<assignment-value>
- <parameter-marker-expression value="1" start-index="64" stop-index="64" />
+ <parameter-marker-expression parameter-index="1" start-index="64" stop-index="64" />
<literal-expression value="1" start-index="64" stop-index="64" />
</assignment-value>
</assignment>
@@ -559,7 +559,7 @@
<owner name="t_order" start-index="67" stop-index="73" />
</column>
<assignment-value>
- <parameter-marker-expression value="2" start-index="84" stop-index="84" />
+ <parameter-marker-expression parameter-index="2" start-index="84" stop-index="84" />
<literal-expression value="init" start-index="84" stop-index="89" />
</assignment-value>
</assignment>
@@ -582,15 +582,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="80" stop-index="80" />
+ <parameter-marker-expression parameter-index="0" start-index="80" stop-index="80" />
<literal-expression value="1" start-index="80" stop-index="80" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="83" stop-index="83" />
+ <parameter-marker-expression parameter-index="1" start-index="83" stop-index="83" />
<literal-expression value="1" start-index="83" stop-index="83" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="86" stop-index="86" />
+ <parameter-marker-expression parameter-index="2" start-index="86" stop-index="86" />
<literal-expression value="init" start-index="86" stop-index="91" />
</assignment-value>
</value>
@@ -623,29 +623,29 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1000" start-index="56" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="10" start-index="62" stop-index="63" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="62" stop-index="62" />
+ <parameter-marker-expression parameter-index="2" start-index="62" stop-index="62" />
<literal-expression value="init" start-index="66" stop-index="71" />
</assignment-value>
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="67" stop-index="67" />
+ <parameter-marker-expression parameter-index="3" start-index="67" stop-index="67" />
<literal-expression value="1100" start-index="76" stop-index="79" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="70" stop-index="70" />
+ <parameter-marker-expression parameter-index="4" start-index="70" stop-index="70" />
<literal-expression value="11" start-index="82" stop-index="83" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="5" start-index="73" stop-index="73" />
+ <parameter-marker-expression parameter-index="5" start-index="73" stop-index="73" />
<literal-expression value="init" start-index="86" stop-index="91" />
</assignment-value>
</value>
@@ -662,7 +662,7 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
@@ -674,15 +674,15 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="1" start-index="74" stop-index="74" />
<literal-expression value="2" start-index="74" stop-index="74" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="77" stop-index="77" />
+ <parameter-marker-expression parameter-index="2" start-index="77" stop-index="77" />
<literal-expression value="2" start-index="77" stop-index="77" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="80" stop-index="80" />
+ <parameter-marker-expression parameter-index="3" start-index="80" stop-index="80" />
<literal-expression value="init" start-index="80" stop-index="85" />
</assignment-value>
</value>
@@ -699,11 +699,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="0" start-index="56" stop-index="56" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="59" stop-index="59" />
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
@@ -712,11 +712,11 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="78" stop-index="78" />
+ <parameter-marker-expression parameter-index="3" start-index="78" stop-index="78" />
<literal-expression value="2" literal-start-index="83" literal-stop-index="83" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="81" stop-index="81" />
+ <parameter-marker-expression parameter-index="4" start-index="81" stop-index="81" />
<literal-expression value="2" literal-start-index="86" literal-stop-index="86" />
</assignment-value>
<assignment-value>
@@ -738,15 +738,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="84" stop-index="84" />
+ <parameter-marker-expression parameter-index="0" start-index="84" stop-index="84" />
<literal-expression value="10000" start-index="84" stop-index="88" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="87" stop-index="87" />
+ <parameter-marker-expression parameter-index="1" start-index="87" stop-index="87" />
<literal-expression value="1000" start-index="91" stop-index="94" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="90" stop-index="90" />
+ <parameter-marker-expression parameter-index="2" start-index="90" stop-index="90" />
<literal-expression value="10" start-index="97" stop-index="98" />
</assignment-value>
<assignment-value>
@@ -758,15 +758,15 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="3" start-index="119" stop-index="119" />
<literal-expression value="10010" start-index="127" stop-index="131" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="4" start-index="122" stop-index="122" />
<literal-expression value="1001" start-index="134" stop-index="137" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="5" start-index="125" stop-index="125" />
+ <parameter-marker-expression parameter-index="5" start-index="125" stop-index="125" />
<literal-expression value="10" start-index="140" stop-index="141" />
</assignment-value>
<assignment-value>
@@ -790,11 +790,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="75" stop-index="75" />
+ <parameter-marker-expression parameter-index="0" start-index="75" stop-index="75" />
<literal-expression value="1000" start-index="75" stop-index="78" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="78" stop-index="78" />
+ <parameter-marker-expression parameter-index="1" start-index="78" stop-index="78" />
<literal-expression value="10" start-index="81" stop-index="82" />
</assignment-value>
<assignment-value>
@@ -806,11 +806,11 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="107" stop-index="107" />
+ <parameter-marker-expression parameter-index="2" start-index="107" stop-index="107" />
<literal-expression value="1001" start-index="111" stop-index="114" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="110" stop-index="110" />
+ <parameter-marker-expression parameter-index="3" start-index="110" stop-index="110" />
<literal-expression value="10" start-index="117" stop-index="118" />
</assignment-value>
<assignment-value>
@@ -834,11 +834,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="65" stop-index="65" />
+ <parameter-marker-expression parameter-index="0" start-index="65" stop-index="65" />
<literal-expression value="7" start-index="65" stop-index="65" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="68" stop-index="68" />
+ <parameter-marker-expression parameter-index="1" start-index="68" stop-index="68" />
<literal-expression value="200" start-index="68" stop-index="70" />
</assignment-value>
<assignment-value>
@@ -846,7 +846,7 @@
<function function-name="ST_GeographyFromText" text="ST_GeographyFromText('SRID=4326;POINT(100 200)')" start-index="71" stop-index="118" literal-start-index="73" literal-stop-index="120" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="121" stop-index="128" />
+ <parameter-marker-expression parameter-index="2" start-index="121" stop-index="128" />
<literal-expression value="{"rule":"null"}'::json" start-index="123" stop-index="146" />
</assignment-value>
</value>
@@ -859,15 +859,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="32" stop-index="32" />
+ <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
<literal-expression value="10000" literal-start-index="32" literal-stop-index="36"/>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="1" start-index="35" stop-index="35" />
<literal-expression value="1000" start-index="35" stop-index="40" literal-start-index="39" literal-stop-index="42" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="2" start-index="38" stop-index="38" />
<literal-expression value="10" start-index="38" stop-index="41" literal-start-index="45" literal-stop-index="46" />
</assignment-value>
<assignment-value>
@@ -886,11 +886,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="32" stop-index="32" />
+ <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
<literal-expression value="1000" start-index="32" stop-index="35" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="1" start-index="35" stop-index="35" />
<literal-expression value="10" start-index="38" stop-index="39" />
</assignment-value>
<assignment-value>
@@ -975,11 +975,11 @@
<function function-name="curdate" text="curdate()" start-index="61" stop-index="69" literal-start-index="61" literal-stop-index="69" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="72" stop-index="72" />
+ <parameter-marker-expression parameter-index="0" start-index="72" stop-index="72" />
<literal-expression value="1000" start-index="72" stop-index="75" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="75" stop-index="75" />
+ <parameter-marker-expression parameter-index="1" start-index="75" stop-index="75" />
<literal-expression value="10" start-index="78" stop-index="79" />
</assignment-value>
</value>
@@ -997,19 +997,19 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="52" stop-index="52" />
+ <parameter-marker-expression parameter-index="0" start-index="52" stop-index="52" />
<literal-expression value="1" start-index="52" stop-index="52" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
<literal-expression value="2" start-index="54" stop-index="54" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="2" start-index="56" stop-index="56" />
<literal-expression value="45" start-index="56" stop-index="57" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="58" stop-index="58" />
+ <parameter-marker-expression parameter-index="3" start-index="58" stop-index="58" />
<literal-expression value="2000" start-index="59" stop-index="62" />
</assignment-value>
</value>
@@ -1039,16 +1039,16 @@
<function function-name="unix_timestamp" text="unix_timestamp(?)" literal-text="unix_timestamp('2019-10-19')" start-index="55" stop-index="71" literal-start-index="55" literal-stop-index="82">
<parameter>
<literal-expression value="2019-10-19" start-index="70" stop-index="81" />
- <parameter-marker-expression value="0" start-index="70" stop-index="70" />
+ <parameter-marker-expression parameter-index="0" start-index="70" stop-index="70" />
</parameter>
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="1" start-index="74" stop-index="74" />
<literal-expression value="1000" start-index="85" stop-index="88" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="77" stop-index="77" />
+ <parameter-marker-expression parameter-index="2" start-index="77" stop-index="77" />
<literal-expression value="10" start-index="91" stop-index="92" />
</assignment-value>
</value>
@@ -1065,15 +1065,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="0" start-index="55" stop-index="55" />
<literal-expression value="1" start-index="55" stop-index="55" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="58" stop-index="58" />
+ <parameter-marker-expression parameter-index="1" start-index="58" stop-index="58" />
<literal-expression value="1" start-index="58" stop-index="58" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="61" stop-index="61" />
+ <parameter-marker-expression parameter-index="2" start-index="61" stop-index="61" />
<literal-expression value="1" start-index="61" stop-index="61" />
</assignment-value>
</value>
@@ -1090,11 +1090,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="89" stop-index="89" />
+ <parameter-marker-expression parameter-index="0" start-index="89" stop-index="89" />
<function function-name="str_to_date" text="str_to_date(?, '%Y-%m-%d')" literal-text="str_to_date('2019-12-10', '%Y-%m-%d')" start-index="61" stop-index="86" literal-start-index="61" literal-stop-index="97">
<parameter>
<literal-expression value="2019-12-10" start-index="73" stop-index="73" literal-start-index="73" literal-stop-index="84" />
- <parameter-marker-expression value="0" start-index="73" stop-index="73" />
+ <parameter-marker-expression parameter-index="0" start-index="73" stop-index="73" />
</parameter>
<parameter>
<literal-expression value="%Y-%m-%d" start-index="76" stop-index="85" literal-start-index="87" literal-stop-index="96" />
@@ -1102,11 +1102,11 @@
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="89" stop-index="89" />
+ <parameter-marker-expression parameter-index="1" start-index="89" stop-index="89" />
<literal-expression value="1" start-index="100" stop-index="100" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="92" stop-index="92" />
+ <parameter-marker-expression parameter-index="2" start-index="92" stop-index="92" />
<literal-expression value="1" start-index="103" stop-index="103" />
</assignment-value>
</value>
@@ -1119,14 +1119,14 @@
<assignment start-index="24" stop-index="35">
<column name="order_id" start-index="24" stop-index="31" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
<literal-expression value="1" start-index="35" stop-index="35" literal-start-index="35" literal-stop-index="35" />
</assignment-value>
</assignment>
<assignment start-index="38" stop-index="48">
<column name="user_id" start-index="38" stop-index="44" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="1" start-index="48" stop-index="48" />
<literal-expression value="1" start-index="48" stop-index="48" literal-start-index="48" literal-stop-index="48" />
</assignment-value>
</assignment>
@@ -1164,15 +1164,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="60" stop-index="60" />
+ <parameter-marker-expression parameter-index="0" start-index="60" stop-index="60" />
<literal-expression value="1" start-index="60" stop-index="60" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="63" stop-index="63" />
+ <parameter-marker-expression parameter-index="1" start-index="63" stop-index="63" />
<literal-expression value="1" start-index="63" stop-index="63" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="2" start-index="66" stop-index="66" />
<literal-expression value="init" start-index="66" stop-index="71" />
</assignment-value>
</value>
@@ -1188,15 +1188,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="118" stop-index="118" />
+ <parameter-marker-expression parameter-index="3" start-index="118" stop-index="118" />
<literal-expression value="2" start-index="123" stop-index="123" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="121" stop-index="121" />
+ <parameter-marker-expression parameter-index="4" start-index="121" stop-index="121" />
<literal-expression value="2" start-index="126" stop-index="126" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="5" start-index="124" stop-index="124" />
+ <parameter-marker-expression parameter-index="5" start-index="124" stop-index="124" />
<literal-expression value="init" start-index="129" stop-index="134" />
</assignment-value>
</value>
@@ -1212,15 +1212,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="6" start-index="176" stop-index="176" />
+ <parameter-marker-expression parameter-index="6" start-index="176" stop-index="176" />
<literal-expression value="3" start-index="186" stop-index="186" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="7" start-index="179" stop-index="179" />
+ <parameter-marker-expression parameter-index="7" start-index="179" stop-index="179" />
<literal-expression value="3" start-index="189" stop-index="189" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="8" start-index="182" stop-index="182" />
+ <parameter-marker-expression parameter-index="8" start-index="182" stop-index="182" />
<literal-expression value="init" start-index="192" stop-index="197" />
</assignment-value>
</value>
@@ -1247,7 +1247,7 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="96" stop-index="96" />
+ <parameter-marker-expression parameter-index="0" start-index="96" stop-index="96" />
<function function-name="date_add" text="date_add(now(),interval ? second)" literal-text="date_add(now(),interval 1 second)" start-index="61" stop-index="93" literal-start-index="61" literal-stop-index="93">
<parameter>
<function function-name="now" text="now()" start-index="70" stop-index="74" />
@@ -1258,11 +1258,11 @@
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="96" stop-index="96" />
+ <parameter-marker-expression parameter-index="1" start-index="96" stop-index="96" />
<literal-expression value="1" start-index="96" stop-index="96" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="99" stop-index="99" />
+ <parameter-marker-expression parameter-index="2" start-index="99" stop-index="99" />
<literal-expression value="1" start-index="99" stop-index="99" />
</assignment-value>
</value>
@@ -1294,7 +1294,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="111" stop-index="113" />
- <parameter-marker-expression value="0" start-index="111" stop-index="111" />
+ <parameter-marker-expression parameter-index="0" start-index="111" stop-index="111" />
</right>
</binary-operation-expression>
</expr>
@@ -1323,7 +1323,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="83" stop-index="85" />
- <parameter-marker-expression value="0" start-index="83" stop-index="83" />
+ <parameter-marker-expression parameter-index="0" start-index="83" stop-index="83" />
</right>
</binary-operation-expression>
</expr>
@@ -1360,7 +1360,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="168" stop-index="170" />
- <parameter-marker-expression value="0" start-index="168" stop-index="168" />
+ <parameter-marker-expression parameter-index="0" start-index="168" stop-index="168" />
</right>
</binary-operation-expression>
</expr>
@@ -1395,7 +1395,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="151" stop-index="153" />
- <parameter-marker-expression value="0" start-index="151" stop-index="151" />
+ <parameter-marker-expression parameter-index="0" start-index="151" stop-index="151" />
</right>
</binary-operation-expression>
</expr>
@@ -1428,7 +1428,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="110" stop-index="112" />
- <parameter-marker-expression value="0" start-index="110" stop-index="110" />
+ <parameter-marker-expression parameter-index="0" start-index="110" stop-index="110" />
</right>
</binary-operation-expression>
</expr>
@@ -1456,7 +1456,7 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="99" stop-index="99" />
+ <parameter-marker-expression parameter-index="0" start-index="99" stop-index="99" />
<literal-expression value="test😀" start-index="38" stop-index="45" />
</assignment-value>
</value>
@@ -1555,15 +1555,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="51" stop-index="51" />
+ <parameter-marker-expression parameter-index="0" start-index="51" stop-index="51" />
<literal-expression value="1" start-index="51" stop-index="51" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
<literal-expression value="1" start-index="54" stop-index="54" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="2" start-index="57" stop-index="57" />
<literal-expression value="init" start-index="57" stop-index="62" />
</assignment-value>
</value>
@@ -1642,11 +1642,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="138" stop-index="138" />
+ <parameter-marker-expression parameter-index="0" start-index="138" stop-index="138" />
<literal-expression value="1" start-index="138" stop-index="138" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="141" stop-index="141" />
+ <parameter-marker-expression parameter-index="1" start-index="141" stop-index="141" />
<literal-expression value="1" start-index="141" stop-index="141" />
</assignment-value>
</value>
@@ -1673,11 +1673,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="108" stop-index="108" />
+ <parameter-marker-expression parameter-index="0" start-index="108" stop-index="108" />
<literal-expression value="1" start-index="108" stop-index="108" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="111" stop-index="111" />
+ <parameter-marker-expression parameter-index="1" start-index="111" stop-index="111" />
<literal-expression value="1" start-index="111" stop-index="111" />
</assignment-value>
</value>
@@ -1703,11 +1703,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="91" stop-index="91" />
+ <parameter-marker-expression parameter-index="0" start-index="91" stop-index="91" />
<literal-expression value="1" start-index="91" stop-index="91" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="94" stop-index="94" />
+ <parameter-marker-expression parameter-index="1" start-index="94" stop-index="94" />
<literal-expression value="1" start-index="94" stop-index="94" />
</assignment-value>
</value>
@@ -1724,11 +1724,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="0" start-index="66" stop-index="66" />
<literal-expression value="1" start-index="66" stop-index="66" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="69" stop-index="69" />
+ <parameter-marker-expression parameter-index="1" start-index="69" stop-index="69" />
<literal-expression value="1" start-index="69" stop-index="69" />
</assignment-value>
</value>
@@ -2016,15 +2016,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" />
+ <parameter-marker-expression parameter-index="0" />
<literal-expression value="1" start-index="56" stop-index="56" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" />
+ <parameter-marker-expression parameter-index="1" />
<literal-expression value="1" start-index="59" stop-index="59" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" />
+ <parameter-marker-expression parameter-index="2" />
<literal-expression value="insert" start-index="62" stop-index="69" />
</assignment-value>
</value>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/replace.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/replace.xml
index edc8df4..12f2775 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/replace.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/replace.xml
@@ -27,15 +27,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="0" start-index="57" stop-index="57" />
<literal-expression value="1" start-index="57" stop-index="57" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="60" stop-index="60" />
+ <parameter-marker-expression parameter-index="1" start-index="60" stop-index="60" />
<literal-expression value="1" start-index="60" stop-index="60" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="63" stop-index="63" />
+ <parameter-marker-expression parameter-index="2" start-index="63" stop-index="63" />
<literal-expression value="init" start-index="63" stop-index="68" />
</assignment-value>
</value>
@@ -54,15 +54,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="86" stop-index="86" />
+ <parameter-marker-expression parameter-index="0" start-index="86" stop-index="86" />
<literal-expression value="1" start-index="86" stop-index="86" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="89" stop-index="89" />
+ <parameter-marker-expression parameter-index="1" start-index="89" stop-index="89" />
<literal-expression value="1" start-index="89" stop-index="89" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="92" stop-index="92" />
+ <parameter-marker-expression parameter-index="2" start-index="92" stop-index="92" />
<literal-expression value="init" start-index="92" stop-index="97" />
</assignment-value>
<assignment-value>
@@ -85,15 +85,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" />
+ <parameter-marker-expression parameter-index="0" />
<literal-expression value="1" start-index="57" stop-index="57" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" />
+ <parameter-marker-expression parameter-index="1" />
<literal-expression value="1" start-index="60" stop-index="60" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" />
+ <parameter-marker-expression parameter-index="2" />
<literal-expression value="replace" start-index="63" stop-index="71" />
</assignment-value>
</value>
@@ -171,15 +171,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="81" stop-index="81" />
+ <parameter-marker-expression parameter-index="0" start-index="81" stop-index="81" />
<literal-expression value="1" start-index="81" stop-index="81" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="84" stop-index="84" />
+ <parameter-marker-expression parameter-index="1" start-index="84" stop-index="84" />
<literal-expression value="1" start-index="84" stop-index="84" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="87" stop-index="87" />
+ <parameter-marker-expression parameter-index="2" start-index="87" stop-index="87" />
<literal-expression value="init" start-index="87" stop-index="92" />
</assignment-value>
</value>
@@ -192,15 +192,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="29" stop-index="29" />
+ <parameter-marker-expression parameter-index="0" start-index="29" stop-index="29" />
<literal-expression value="1" start-index="29" stop-index="29" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="32" stop-index="32" />
+ <parameter-marker-expression parameter-index="1" start-index="32" stop-index="32" />
<literal-expression value="1" start-index="32" stop-index="32" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="2" start-index="35" stop-index="35" />
<literal-expression value="init" start-index="35" stop-index="40" />
</assignment-value>
</value>
@@ -213,21 +213,21 @@
<assignment>
<column name="order_id" start-index="25" stop-index="32" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="36" stop-index="36" />
+ <parameter-marker-expression parameter-index="0" start-index="36" stop-index="36" />
<literal-expression value="1" literal-start-index="36" literal-stop-index="36"/>
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="39" stop-index="45" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="49" stop-index="49" />
+ <parameter-marker-expression parameter-index="1" start-index="49" stop-index="49" />
<literal-expression value="1" literal-start-index="49" literal-stop-index="49" />
</assignment-value>
</assignment>
<assignment>
<column name="status" start-index="52" stop-index="57" />
<assignment-value>
- <parameter-marker-expression value="2" start-index="61" stop-index="61" />
+ <parameter-marker-expression parameter-index="2" start-index="61" stop-index="61" />
<literal-expression value="init" literal-start-index="61" literal-stop-index="66" />
</assignment-value>
</assignment>
@@ -244,11 +244,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="0" start-index="57" stop-index="57" />
<literal-expression value="1" start-index="57" stop-index="57" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="60" stop-index="60" />
+ <parameter-marker-expression parameter-index="1" start-index="60" stop-index="60" />
<literal-expression value="1" start-index="60" stop-index="60" />
</assignment-value>
<assignment-value>
@@ -264,14 +264,14 @@
<assignment>
<column name="order_id" start-index="25" stop-index="32" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="36" stop-index="36" />
+ <parameter-marker-expression parameter-index="0" start-index="36" stop-index="36" />
<literal-expression value="1" start-index="36" stop-index="36" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="39" stop-index="45" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="49" stop-index="49" />
+ <parameter-marker-expression parameter-index="1" start-index="49" stop-index="49" />
<literal-expression value="1" start-index="49" stop-index="49" />
</assignment-value>
</assignment>
@@ -296,15 +296,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="85" stop-index="85" />
+ <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85" />
<literal-expression value="10000" start-index="85" stop-index="89" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="88" stop-index="88" />
+ <parameter-marker-expression parameter-index="1" start-index="88" stop-index="88" />
<literal-expression value="1000" start-index="92" stop-index="95" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="91" stop-index="91" />
+ <parameter-marker-expression parameter-index="2" start-index="91" stop-index="91" />
<literal-expression value="10" start-index="98" stop-index="99" />
</assignment-value>
<assignment-value>
@@ -328,11 +328,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="76" stop-index="76" />
+ <parameter-marker-expression parameter-index="0" start-index="76" stop-index="76" />
<literal-expression value="1000" start-index="76" stop-index="79" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="79" stop-index="79" />
+ <parameter-marker-expression parameter-index="1" start-index="79" stop-index="79" />
<literal-expression value="10" start-index="82" stop-index="83" />
</assignment-value>
<assignment-value>
@@ -351,21 +351,21 @@
<assignment>
<column name="item_id" start-index="30" stop-index="36" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="40" stop-index="40" />
+ <parameter-marker-expression parameter-index="0" start-index="40" stop-index="40" />
<literal-expression value="10000" start-index="40" stop-index="44" />
</assignment-value>
</assignment>
<assignment>
<column name="order_id" start-index="43" stop-index="50" literal-start-index="47" literal-stop-index="54" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
<literal-expression value="1000" start-index="58" stop-index="61" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="57" stop-index="63" literal-start-index="64" literal-stop-index="70" />
<assignment-value>
- <parameter-marker-expression value="2" start-index="67" stop-index="67" />
+ <parameter-marker-expression parameter-index="2" start-index="67" stop-index="67" />
<literal-expression value="10" start-index="74" stop-index="75" />
</assignment-value>
</assignment>
@@ -390,14 +390,14 @@
<assignment>
<column name="order_id" start-index="30" stop-index="37" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="41" stop-index="41" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="41" />
<literal-expression value="1000" start-index="41" stop-index="44" />
</assignment-value>
</assignment>
<assignment>
<column name="user_id" start-index="44" stop-index="50" literal-start-index="47" literal-stop-index="53" />
<assignment-value>
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
<literal-expression value="10" start-index="57" stop-index="58" />
</assignment-value>
</assignment>
@@ -424,7 +424,7 @@
<owner name="t_order" start-index="25" stop-index="31" />
</column>
<assignment-value>
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
<literal-expression value="1" start-index="44" stop-index="44" />
</assignment-value>
</assignment>
@@ -433,7 +433,7 @@
<owner name="t_order" start-index="47" stop-index="53" />
</column>
<assignment-value>
- <parameter-marker-expression value="1" start-index="65" stop-index="65" />
+ <parameter-marker-expression parameter-index="1" start-index="65" stop-index="65" />
<literal-expression value="1" start-index="65" stop-index="65" />
</assignment-value>
</assignment>
@@ -442,7 +442,7 @@
<owner name="t_order" start-index="68" stop-index="74" />
</column>
<assignment-value>
- <parameter-marker-expression value="2" start-index="85" stop-index="85" />
+ <parameter-marker-expression parameter-index="2" start-index="85" stop-index="85" />
<literal-expression value="init" start-index="85" stop-index="90" />
</assignment-value>
</assignment>
@@ -459,29 +459,29 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="0" start-index="57" stop-index="57" />
<literal-expression value="1000" start-index="57" stop-index="60" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="60" stop-index="60" />
+ <parameter-marker-expression parameter-index="1" start-index="60" stop-index="60" />
<literal-expression value="10" start-index="63" stop-index="64" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="63" stop-index="63" />
+ <parameter-marker-expression parameter-index="2" start-index="63" stop-index="63" />
<literal-expression value="init" start-index="67" stop-index="72" />
</assignment-value>
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="68" stop-index="68" />
+ <parameter-marker-expression parameter-index="3" start-index="68" stop-index="68" />
<literal-expression value="1100" start-index="77" stop-index="80" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="71" stop-index="71" />
+ <parameter-marker-expression parameter-index="4" start-index="71" stop-index="71" />
<literal-expression value="11" start-index="83" stop-index="84" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="5" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="5" start-index="74" stop-index="74" />
<literal-expression value="init" start-index="87" stop-index="92" />
</assignment-value>
</value>
@@ -498,7 +498,7 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="0" start-index="57" stop-index="57" />
<literal-expression value="1" start-index="57" stop-index="57" />
</assignment-value>
<assignment-value>
@@ -510,15 +510,15 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="76" stop-index="76" />
+ <parameter-marker-expression parameter-index="1" start-index="76" stop-index="76" />
<literal-expression value="2" start-index="76" stop-index="76" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="79" stop-index="79" />
+ <parameter-marker-expression parameter-index="2" start-index="79" stop-index="79" />
<literal-expression value="2" start-index="79" stop-index="79" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="82" stop-index="82" />
+ <parameter-marker-expression parameter-index="3" start-index="82" stop-index="82" />
<literal-expression value="init" start-index="82" stop-index="87" />
</assignment-value>
</value>
@@ -541,15 +541,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="85" stop-index="85" />
+ <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85" />
<literal-expression value="10000" start-index="85" stop-index="89" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="88" stop-index="88" />
+ <parameter-marker-expression parameter-index="1" start-index="88" stop-index="88" />
<literal-expression value="1000" start-index="92" stop-index="95" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="91" stop-index="91" />
+ <parameter-marker-expression parameter-index="2" start-index="91" stop-index="91" />
<literal-expression value="10" start-index="98" stop-index="99" />
</assignment-value>
<assignment-value>
@@ -561,15 +561,15 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="121" stop-index="121" />
+ <parameter-marker-expression parameter-index="3" start-index="121" stop-index="121" />
<literal-expression value="10010" start-index="129" stop-index="133" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="4" start-index="124" stop-index="124" />
+ <parameter-marker-expression parameter-index="4" start-index="124" stop-index="124" />
<literal-expression value="1001" start-index="136" stop-index="139" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="5" start-index="127" stop-index="127" />
+ <parameter-marker-expression parameter-index="5" start-index="127" stop-index="127" />
<literal-expression value="10" start-index="142" stop-index="143" />
</assignment-value>
<assignment-value>
@@ -593,11 +593,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="76" stop-index="76" />
+ <parameter-marker-expression parameter-index="0" start-index="76" stop-index="76" />
<literal-expression value="1000" start-index="76" stop-index="79" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="79" stop-index="79" />
+ <parameter-marker-expression parameter-index="1" start-index="79" stop-index="79" />
<literal-expression value="10" start-index="82" stop-index="83" />
</assignment-value>
<assignment-value>
@@ -609,11 +609,11 @@
</value>
<value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="109" stop-index="109" />
+ <parameter-marker-expression parameter-index="2" start-index="109" stop-index="109" />
<literal-expression value="1001" start-index="113" stop-index="116" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="3" start-index="112" stop-index="112" />
+ <parameter-marker-expression parameter-index="3" start-index="112" stop-index="112" />
<literal-expression value="10" start-index="119" stop-index="120" />
</assignment-value>
<assignment-value>
@@ -632,15 +632,15 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="33" stop-index="33" />
+ <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
<literal-expression value="10000" literal-start-index="33" literal-stop-index="37"/>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="36" stop-index="36" />
+ <parameter-marker-expression parameter-index="1" start-index="36" stop-index="36" />
<literal-expression value="1000" start-index="36" stop-index="41" literal-start-index="40" literal-stop-index="43" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="2" start-index="39" stop-index="39" />
<literal-expression value="10" start-index="39" stop-index="42" literal-start-index="46" literal-stop-index="47" />
</assignment-value>
<assignment-value>
@@ -659,11 +659,11 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="33" stop-index="33" />
+ <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
<literal-expression value="1000" start-index="33" stop-index="36" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="36" stop-index="36" />
+ <parameter-marker-expression parameter-index="1" start-index="36" stop-index="36" />
<literal-expression value="10" start-index="39" stop-index="40" />
</assignment-value>
<assignment-value>
@@ -748,11 +748,11 @@
<function function-name="curdate" text="curdate()" start-index="62" stop-index="70" literal-start-index="62" literal-stop-index="70" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="73" stop-index="73" />
+ <parameter-marker-expression parameter-index="0" start-index="73" stop-index="73" />
<literal-expression value="1000" start-index="73" stop-index="76" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="76" stop-index="76" />
+ <parameter-marker-expression parameter-index="1" start-index="76" stop-index="76" />
<literal-expression value="10" start-index="79" stop-index="80" />
</assignment-value>
</value>
@@ -772,16 +772,16 @@
<function function-name="unix_timestamp" text="unix_timestamp(?)" literal-text="unix_timestamp('2019-10-19')" start-index="56" stop-index="72" literal-start-index="56" literal-stop-index="83">
<parameter>
<literal-expression literal-start-index="71" literal-stop-index="82" value="2019-10-19" />
- <parameter-marker-expression value="0" start-index="71" stop-index="71" />
+ <parameter-marker-expression parameter-index="0" start-index="71" stop-index="71" />
</parameter>
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="75" stop-index="75" />
+ <parameter-marker-expression parameter-index="1" start-index="75" stop-index="75" />
<literal-expression value="1000" start-index="86" stop-index="89" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="78" stop-index="78" />
+ <parameter-marker-expression parameter-index="2" start-index="78" stop-index="78" />
<literal-expression value="10" start-index="92" stop-index="93" />
</assignment-value>
</value>
@@ -798,10 +798,10 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="90" stop-index="90" />
+ <parameter-marker-expression parameter-index="0" start-index="90" stop-index="90" />
<function function-name="str_to_date" text="str_to_date(?, '%Y-%m-%d')" literal-text="str_to_date('2019-12-10', '%Y-%m-%d')" start-index="62" stop-index="87" literal-start-index="62" literal-stop-index="98">
<parameter>
- <parameter-marker-expression value="0" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="0" start-index="74" stop-index="74" />
<literal-expression value="2019-12-10" start-index="77" stop-index="77" literal-start-index="74" literal-stop-index="85" />
</parameter>
<parameter>
@@ -810,11 +810,11 @@
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="90" stop-index="90" />
+ <parameter-marker-expression parameter-index="1" start-index="90" stop-index="90" />
<literal-expression value="1" start-index="101" stop-index="101" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="93" stop-index="93" />
+ <parameter-marker-expression parameter-index="2" start-index="93" stop-index="93" />
<literal-expression value="1" start-index="104" stop-index="104" />
</assignment-value>
</value>
@@ -831,7 +831,7 @@
<values>
<value>
<assignment-value>
- <parameter-marker-expression value="0" start-index="97" stop-index="97" />
+ <parameter-marker-expression parameter-index="0" start-index="97" stop-index="97" />
<function function-name="date_add" text="date_add(now(),interval ? second)" literal-text="date_add(now(),interval 1 second)" start-index="62" stop-index="94" literal-start-index="62" literal-stop-index="94">
<parameter>
<function function-name="now" text="now()" start-index="71" stop-index="75" />
@@ -842,11 +842,11 @@
</function>
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="1" start-index="97" stop-index="97" />
+ <parameter-marker-expression parameter-index="1" start-index="97" stop-index="97" />
<literal-expression value="1" start-index="97" stop-index="97" />
</assignment-value>
<assignment-value>
- <parameter-marker-expression value="2" start-index="100" stop-index="100" />
+ <parameter-marker-expression parameter-index="2" start-index="100" stop-index="100" />
<literal-expression value="1" start-index="100" stop-index="100" />
</assignment-value>
</value>
@@ -878,7 +878,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="112" stop-index="114" />
- <parameter-marker-expression value="0" start-index="112" stop-index="112" />
+ <parameter-marker-expression parameter-index="0" start-index="112" stop-index="112" />
</right>
</binary-operation-expression>
</expr>
@@ -907,7 +907,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="84" stop-index="86" />
- <parameter-marker-expression value="0" start-index="84" stop-index="84" />
+ <parameter-marker-expression parameter-index="0" start-index="84" stop-index="84" />
</right>
</binary-operation-expression>
</expr>
@@ -944,7 +944,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="169" stop-index="171" />
- <parameter-marker-expression value="0" start-index="169" stop-index="169" />
+ <parameter-marker-expression parameter-index="0" start-index="169" stop-index="169" />
</right>
</binary-operation-expression>
</expr>
@@ -979,7 +979,7 @@
<operator>=</operator>
<right>
<literal-expression value="100" start-index="152" stop-index="154" />
- <parameter-marker-expression value="0" start-index="152" stop-index="152" />
+ <parameter-marker-expression parameter-index="0" start-index="152" stop-index="152" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
index ebc4aa3..3c6da3d 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
@@ -191,11 +191,11 @@
<list-expression start-index="135" stop-index="140">
<items>
<literal-expression value="1" start-index="136" stop-index="136" />
- <parameter-marker-expression value="0" start-index="136" stop-index="136" />
+ <parameter-marker-expression parameter-index="0" start-index="136" stop-index="136" />
</items>
<items>
<literal-expression value="2" start-index="139" stop-index="139" />
- <parameter-marker-expression value="1" start-index="139" stop-index="139" />
+ <parameter-marker-expression parameter-index="1" start-index="139" stop-index="139" />
</items>
</list-expression>
</right>
@@ -214,11 +214,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="165" stop-index="165" />
- <parameter-marker-expression value="2" start-index="165" stop-index="165" />
+ <parameter-marker-expression parameter-index="2" start-index="165" stop-index="165" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="171" stop-index="172" />
- <parameter-marker-expression value="3" start-index="171" stop-index="171" />
+ <parameter-marker-expression parameter-index="3" start-index="171" stop-index="171" />
</and-expr>
</between-expression>
</right>
@@ -291,11 +291,11 @@
<list-expression start-index="138" stop-index="143">
<items>
<literal-expression value="1" start-index="139" stop-index="139" />
- <parameter-marker-expression value="0" start-index="139" stop-index="139" />
+ <parameter-marker-expression parameter-index="0" start-index="139" stop-index="139" />
</items>
<items>
<literal-expression value="2" start-index="142" stop-index="142" />
- <parameter-marker-expression value="1" start-index="142" stop-index="142" />
+ <parameter-marker-expression parameter-index="1" start-index="142" stop-index="142" />
</items>
</list-expression>
</right>
@@ -312,11 +312,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="168" stop-index="168" />
- <parameter-marker-expression value="2" start-index="168" stop-index="168" />
+ <parameter-marker-expression parameter-index="2" start-index="168" stop-index="168" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="174" stop-index="175" />
- <parameter-marker-expression value="3" start-index="174" stop-index="174" />
+ <parameter-marker-expression parameter-index="3" start-index="174" stop-index="174" />
</and-expr>
</between-expression>
</right>
@@ -370,11 +370,11 @@
<list-expression start-index="49" stop-index="54">
<items>
<literal-expression value="1" start-index="50" stop-index="50" />
- <parameter-marker-expression value="0" start-index="50" stop-index="50" />
+ <parameter-marker-expression parameter-index="0" start-index="50" stop-index="50" />
</items>
<items>
<literal-expression value="2" start-index="53" stop-index="53" />
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
</items>
</list-expression>
</right>
@@ -403,11 +403,11 @@
<list-expression start-index="47" stop-index="52">
<items>
<literal-expression value="1" start-index="48" stop-index="48" />
- <parameter-marker-expression value="0" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48" />
</items>
<items>
<literal-expression value="2" start-index="51" stop-index="51" />
- <parameter-marker-expression value="1" start-index="51" stop-index="51" />
+ <parameter-marker-expression parameter-index="1" start-index="51" stop-index="51" />
</items>
</list-expression>
</right>
@@ -424,11 +424,11 @@
<list-expression start-index="76" stop-index="81">
<items>
<literal-expression value="7" start-index="77" stop-index="77" />
- <parameter-marker-expression value="2" start-index="77" stop-index="77" />
+ <parameter-marker-expression parameter-index="2" start-index="77" stop-index="77" />
</items>
<items>
<literal-expression value="9" start-index="80" stop-index="80" />
- <parameter-marker-expression value="3" start-index="80" stop-index="80" />
+ <parameter-marker-expression parameter-index="3" start-index="80" stop-index="80" />
</items>
</list-expression>
</right>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
index 8073ee0..1fd5946 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
@@ -89,7 +89,7 @@
<operator>REGEXP</operator>
<right>
<literal-expression value="init" start-index="51" stop-index="56"/>
- <parameter-marker-expression value="0" start-index="51" stop-index="51"/>
+ <parameter-marker-expression parameter-index="0" start-index="51" stop-index="51"/>
</right>
</binary-operation-expression>
</left>
@@ -106,11 +106,11 @@
<list-expression start-index="70" stop-index="75" literal-start-index="75" literal-stop-index="80">
<items>
<literal-expression value="1" start-index="76" stop-index="76"/>
- <parameter-marker-expression value="1" start-index="71" stop-index="71"/>
+ <parameter-marker-expression parameter-index="1" start-index="71" stop-index="71"/>
</items>
<items>
<literal-expression value="2" start-index="79" stop-index="79"/>
- <parameter-marker-expression value="2" start-index="74" stop-index="74"/>
+ <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74"/>
</items>
</list-expression>
</right>
@@ -196,7 +196,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</left>
@@ -205,7 +205,7 @@
<binary-operation-expression start-index="52" stop-index="71">
<left>
<literal-expression value="2" start-index="52" stop-index="52"/>
- <parameter-marker-expression value="1" start-index="52" stop-index="52"/>
+ <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
</left>
<operator>=</operator>
<right>
@@ -274,7 +274,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</left>
@@ -283,7 +283,7 @@
<binary-operation-expression start-index="53" stop-index="72">
<left>
<literal-expression value="2" start-index="53" stop-index="53"/>
- <parameter-marker-expression value="1" start-index="53" stop-index="53"/>
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
</left>
<operator>=</operator>
<right>
@@ -318,7 +318,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</left>
@@ -327,7 +327,7 @@
<binary-operation-expression start-index="53" stop-index="72">
<left>
<literal-expression value="2" start-index="53" stop-index="53"/>
- <parameter-marker-expression value="1" start-index="53" stop-index="53"/>
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
</left>
<operator>=</operator>
<right>
@@ -364,7 +364,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</left>
@@ -373,7 +373,7 @@
<binary-operation-expression start-index="53" stop-index="72">
<left>
<literal-expression value="2" start-index="53" stop-index="53"/>
- <parameter-marker-expression value="1" start-index="53" stop-index="53"/>
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
</left>
<operator>=</operator>
<right>
@@ -406,7 +406,7 @@
<binary-operation-expression start-index="107" stop-index="126">
<left>
<literal-expression value="2" start-index="107" stop-index="107"/>
- <parameter-marker-expression value="2" start-index="107" stop-index="107"/>
+ <parameter-marker-expression parameter-index="2" start-index="107" stop-index="107"/>
</left>
<operator>=</operator>
<right>
@@ -443,7 +443,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</left>
@@ -452,7 +452,7 @@
<binary-operation-expression start-index="52" stop-index="71">
<left>
<literal-expression value="2" start-index="52" stop-index="52"/>
- <parameter-marker-expression value="1" start-index="52" stop-index="52"/>
+ <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
</left>
<operator>=</operator>
<right>
@@ -481,7 +481,7 @@
<binary-operation-expression start-index="33" stop-index="52">
<left>
<literal-expression value="1" start-index="33" stop-index="33"/>
- <parameter-marker-expression value="0" start-index="33" stop-index="33"/>
+ <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33"/>
</left>
<operator>=</operator>
<right>
@@ -510,7 +510,7 @@
<binary-operation-expression start-index="32" stop-index="51">
<left>
<literal-expression value="1" start-index="32" stop-index="32"/>
- <parameter-marker-expression value="0" start-index="32" stop-index="32"/>
+ <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32"/>
</left>
<operator>=</operator>
<right>
@@ -539,7 +539,7 @@
<binary-operation-expression start-index="28" stop-index="47">
<left>
<literal-expression value="1" start-index="28" stop-index="28"/>
- <parameter-marker-expression value="0" start-index="28" stop-index="28"/>
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
</left>
<operator>=</operator>
<right>
@@ -572,7 +572,7 @@
<binary-operation-expression start-index="28" stop-index="47">
<left>
<literal-expression value="1" start-index="28" stop-index="28"/>
- <parameter-marker-expression value="0" start-index="28" stop-index="28"/>
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
</left>
<operator>=</operator>
<right>
@@ -725,7 +725,7 @@
<operator>></operator>
<right>
<literal-expression value="1" start-index="97" stop-index="97"/>
- <parameter-marker-expression value="0" start-index="97" stop-index="97"/>
+ <parameter-marker-expression parameter-index="0" start-index="97" stop-index="97"/>
</right>
</binary-operation-expression>
</expr>
@@ -772,7 +772,7 @@
<operator>></operator>
<right>
<literal-expression value="1" start-index="102" stop-index="102"/>
- <parameter-marker-expression value="0" start-index="102" stop-index="102"/>
+ <parameter-marker-expression parameter-index="0" start-index="102" stop-index="102"/>
</right>
</binary-operation-expression>
</expr>
@@ -805,15 +805,15 @@
<list-expression start-index="48" stop-index="56">
<items>
<literal-expression value="1" start-index="49" stop-index="49"/>
- <parameter-marker-expression value="0" start-index="49" stop-index="49"/>
+ <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
</items>
<items>
<literal-expression value="2" start-index="52" stop-index="52"/>
- <parameter-marker-expression value="1" start-index="52" stop-index="52"/>
+ <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
</items>
<items>
<literal-expression value="3" start-index="55" stop-index="55"/>
- <parameter-marker-expression value="2" start-index="55" stop-index="55"/>
+ <parameter-marker-expression parameter-index="2" start-index="55" stop-index="55"/>
</items>
</list-expression>
</right>
@@ -840,11 +840,11 @@
</left>
<between-expr>
<literal-expression value="1" start-index="53" stop-index="53"/>
- <parameter-marker-expression value="0" start-index="53" stop-index="53"/>
+ <parameter-marker-expression parameter-index="0" start-index="53" stop-index="53"/>
</between-expr>
<and-expr>
<literal-expression value="2" start-index="59" stop-index="59"/>
- <parameter-marker-expression value="1" start-index="59" stop-index="59"/>
+ <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59"/>
</and-expr>
</between-expression>
</expr>
@@ -948,7 +948,7 @@
<operator>|</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -973,7 +973,7 @@
<operator>&</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -998,7 +998,7 @@
<operator><<</operator>
<right>
<literal-expression value="1" start-index="48" stop-index="48"/>
- <parameter-marker-expression value="0" start-index="48" stop-index="48"/>
+ <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48"/>
</right>
</binary-operation-expression>
</expr>
@@ -1023,7 +1023,7 @@
<operator>>></operator>
<right>
<literal-expression value="1" start-index="48" stop-index="48"/>
- <parameter-marker-expression value="0" start-index="48" stop-index="48"/>
+ <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48"/>
</right>
</binary-operation-expression>
</expr>
@@ -1048,7 +1048,7 @@
<operator>+</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1073,7 +1073,7 @@
<operator>-</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1098,7 +1098,7 @@
<operator>*</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1123,7 +1123,7 @@
<operator>/</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1148,7 +1148,7 @@
<operator>DIV</operator>
<right>
<literal-expression value="1" start-index="49" stop-index="49"/>
- <parameter-marker-expression value="0" start-index="49" stop-index="49"/>
+ <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
</right>
</binary-operation-expression>
</expr>
@@ -1173,7 +1173,7 @@
<operator>MOD</operator>
<right>
<literal-expression value="1" start-index="49" stop-index="49"/>
- <parameter-marker-expression value="0" start-index="49" stop-index="49"/>
+ <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
</right>
</binary-operation-expression>
</expr>
@@ -1198,7 +1198,7 @@
<operator>%</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1223,7 +1223,7 @@
<operator>^</operator>
<right>
<literal-expression value="1" start-index="47" stop-index="47"/>
- <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
</right>
</binary-operation-expression>
</expr>
@@ -1290,7 +1290,7 @@
<binary-operation-expression start-index="28" stop-index="39">
<left>
<literal-expression value="1" start-index="28" stop-index="28"/>
- <parameter-marker-expression value="0" start-index="28" stop-index="28"/>
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
</left>
<operator><</operator>
<right>
@@ -1346,13 +1346,18 @@
<projections distinct-row="false" start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7"/>
</projections>
- <where start-index="22" stop-index="64">
+ <where start-index="22" stop-index="45" literal-stop-index="64">
<expr>
- <common-expression text="order_id collate 'utf8mb4_0900_ai_ci'" start-index="28" stop-index="64"/>
+ <collate-expression start-index="28" stop-index="45" literal-stop-index="64">
+ <collate-name>
+ <literal-expression value="'utf8mb4_0900_ai_ci'" start-index="37" stop-index="64"/>
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45"/>
+ </collate-name>
+ </collate-expression>
</expr>
</where>
</select>
-
+
<select sql-case-id="select_where_with_simple_expr_with_variable">
<from start-index="14" stop-index="20">
<simple-table name="t_order" start-index="14" stop-index="20"/>
@@ -1387,7 +1392,7 @@
<binary-operation-expression start-index="28" stop-index="47">
<left>
<literal-expression value="1" start-index="28" stop-index="28"/>
- <parameter-marker-expression value="0" start-index="28" stop-index="28"/>
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
</left>
<operator>+</operator>
<right>
@@ -1412,7 +1417,7 @@
<binary-operation-expression start-index="28" stop-index="47">
<left>
<literal-expression value="1" start-index="28" stop-index="28"/>
- <parameter-marker-expression value="0" start-index="28" stop-index="28"/>
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
</left>
<operator>-</operator>
<right>
@@ -1492,7 +1497,7 @@
</left>
<operator>=</operator>
<right>
- <parameter-marker-expression value="0" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="0" start-index="54" stop-index="54" />
<literal-expression value="1" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
@@ -1548,7 +1553,7 @@
<operator>></operator>
<right>
<literal-expression value="1" start-index="78" stop-index="78"/>
- <parameter-marker-expression value="0" start-index="78" stop-index="78"/>
+ <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78"/>
</right>
</binary-operation-expression>
</expr>
@@ -1587,7 +1592,7 @@
<operator>></operator>
<right>
<literal-expression value="1" start-index="85" stop-index="85"/>
- <parameter-marker-expression value="0" start-index="85" stop-index="85"/>
+ <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85"/>
</right>
</binary-operation-expression>
</expr>
@@ -2018,4 +2023,23 @@
</expression-projection>
</projections>
</select>
+
+ <select sql-case-id="select_with_collate_with_marker" parameters="latin1_bin">
+ <projections start-index="7" stop-index="7">
+ <shorthand-projection start-index="7" stop-index="7" />
+ </projections>
+ <from>
+ <simple-table name="t_order" start-index="14" stop-index="20" />
+ </from>
+ <where start-index="22" stop-index="45" literal-stop-index="54">
+ <expr>
+ <collate-expression start-index="28" stop-index="45" literal-stop-index="54">
+ <collate-name>
+ <literal-expression value="latin1_bin" start-index="37" stop-index="54"/>
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45"/>
+ </collate-name>
+ </collate-expression>
+ </expr>
+ </where>
+ </select>
</sql-parser-test-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-group-by.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-group-by.xml
index 398bdeb..0487603 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-group-by.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-group-by.xml
@@ -177,11 +177,11 @@
<list-expression start-index="138" stop-index="143">
<items>
<literal-expression value="1" start-index="139" stop-index="139" />
- <parameter-marker-expression value="0" start-index="139" stop-index="139" />
+ <parameter-marker-expression parameter-index="0" start-index="139" stop-index="139" />
</items>
<items>
<literal-expression value="2" start-index="142" stop-index="142" />
- <parameter-marker-expression value="1" start-index="142" stop-index="142" />
+ <parameter-marker-expression parameter-index="1" start-index="142" stop-index="142" />
</items>
</list-expression>
</right>
@@ -198,11 +198,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="168" stop-index="168" />
- <parameter-marker-expression value="2" start-index="168" stop-index="168" />
+ <parameter-marker-expression parameter-index="2" start-index="168" stop-index="168" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="174" stop-index="175" />
- <parameter-marker-expression value="3" start-index="174" stop-index="174" />
+ <parameter-marker-expression parameter-index="3" start-index="174" stop-index="174" />
</and-expr>
</between-expression>
</right>
@@ -304,11 +304,11 @@
<list-expression start-index="124" stop-index="129" literal-stop-index="135">
<items>
<literal-expression value="1000" start-index="125" stop-index="128" />
- <parameter-marker-expression value="0" start-index="125" stop-index="125" />
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
</items>
<items>
<literal-expression value="1100" start-index="131" stop-index="134" />
- <parameter-marker-expression value="1" start-index="128" stop-index="128" />
+ <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128" />
</items>
</list-expression>
</right>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-into.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-into.xml
index 91e2ea2..6bee5ab 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-into.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-into.xml
@@ -33,7 +33,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="55" stop-index="55" />
- <parameter-marker-expression value="0" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="0" start-index="55" stop-index="55" />
</right>
</binary-operation-expression>
</expr>
@@ -56,7 +56,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
@@ -80,7 +80,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="53" stop-index="53" />
- <parameter-marker-expression value="0" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="0" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</expr>
@@ -164,7 +164,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
@@ -188,7 +188,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-join.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-join.xml
index 82be313..8093582 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-join.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-join.xml
@@ -59,7 +59,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="98" stop-index="101" />
- <parameter-marker-expression value="0" start-index="98" stop-index="98" />
+ <parameter-marker-expression parameter-index="0" start-index="98" stop-index="98" />
</right>
</binary-operation-expression>
</expr>
@@ -108,7 +108,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="122" stop-index="125" />
- <parameter-marker-expression value="0" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="0" start-index="122" stop-index="122" />
</right>
</binary-operation-expression>
</expr>
@@ -143,7 +143,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="81" stop-index="84" />
- <parameter-marker-expression value="0" start-index="81" stop-index="81" />
+ <parameter-marker-expression parameter-index="0" start-index="81" stop-index="81" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-lock.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-lock.xml
index d0fd5b3..b2d3450 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-lock.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-lock.xml
@@ -27,7 +27,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</expr>
@@ -51,7 +51,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</expr>
@@ -75,7 +75,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</expr>
@@ -99,7 +99,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</expr>
@@ -123,7 +123,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</expr>
@@ -167,7 +167,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="106" stop-index="106" />
- <parameter-marker-expression value="0" start-index="106" stop-index="106" />
+ <parameter-marker-expression parameter-index="0" start-index="106" stop-index="106" />
</right>
</binary-operation-expression>
</right>
@@ -243,7 +243,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="151" stop-index="151" />
- <parameter-marker-expression value="0" start-index="151" stop-index="151" />
+ <parameter-marker-expression parameter-index="0" start-index="151" stop-index="151" />
</right>
</binary-operation-expression>
</right>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-or.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-or.xml
index b0ffcbb..6df1b71 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-or.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-or.xml
@@ -35,7 +35,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -48,7 +48,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="55" stop-index="55" />
- <parameter-marker-expression value="1" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="1" start-index="55" stop-index="55" />
</right>
</binary-operation-expression>
</right>
@@ -75,7 +75,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -88,7 +88,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="54" stop-index="54" />
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
</right>
@@ -115,7 +115,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -128,7 +128,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="53" stop-index="58" />
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</right>
@@ -157,7 +157,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="40" stop-index="40" />
- <parameter-marker-expression value="0" start-index="40" stop-index="40" />
+ <parameter-marker-expression parameter-index="0" start-index="40" stop-index="40" />
</right>
</binary-operation-expression>
</left>
@@ -170,7 +170,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="54" stop-index="59" />
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
</right>
@@ -185,7 +185,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="76" stop-index="76" />
- <parameter-marker-expression value="2" start-index="71" stop-index="71" />
+ <parameter-marker-expression parameter-index="2" start-index="71" stop-index="71" />
</right>
</binary-operation-expression>
</right>
@@ -214,7 +214,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="39" stop-index="44" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -229,7 +229,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="62" stop-index="62" />
- <parameter-marker-expression value="1" start-index="57" stop-index="57" />
+ <parameter-marker-expression parameter-index="1" start-index="57" stop-index="57" />
</right>
</binary-operation-expression>
</left>
@@ -242,7 +242,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="79" stop-index="79" />
- <parameter-marker-expression value="2" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74" />
</right>
</binary-operation-expression>
</right>
@@ -261,7 +261,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="98" stop-index="98" />
- <parameter-marker-expression value="3" start-index="93" stop-index="93" />
+ <parameter-marker-expression parameter-index="3" start-index="93" stop-index="93" />
</right>
</binary-operation-expression>
</left>
@@ -274,7 +274,7 @@
<operator>=</operator>
<right>
<literal-expression value="4" start-index="114" stop-index="114" />
- <parameter-marker-expression value="4" start-index="109" stop-index="109" />
+ <parameter-marker-expression parameter-index="4" start-index="109" stop-index="109" />
</right>
</binary-operation-expression>
</right>
@@ -351,7 +351,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</right>
</binary-operation-expression>
</left>
@@ -366,7 +366,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="137" stop-index="137" />
- <parameter-marker-expression value="1" start-index="137" stop-index="137" />
+ <parameter-marker-expression parameter-index="1" start-index="137" stop-index="137" />
</right>
</binary-operation-expression>
</right>
@@ -383,7 +383,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="156" stop-index="156" />
- <parameter-marker-expression value="2" start-index="156" stop-index="156" />
+ <parameter-marker-expression parameter-index="2" start-index="156" stop-index="156" />
</right>
</binary-operation-expression>
</right>
@@ -482,7 +482,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="167" stop-index="167" />
- <parameter-marker-expression value="0" start-index="167" stop-index="167" />
+ <parameter-marker-expression parameter-index="0" start-index="167" stop-index="167" />
</right>
</binary-operation-expression>
</left>
@@ -497,7 +497,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="185" stop-index="185" />
- <parameter-marker-expression value="1" start-index="185" stop-index="185" />
+ <parameter-marker-expression parameter-index="1" start-index="185" stop-index="185" />
</right>
</binary-operation-expression>
</right>
@@ -514,7 +514,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="204" stop-index="204" />
- <parameter-marker-expression value="2" start-index="204" stop-index="204" />
+ <parameter-marker-expression parameter-index="2" start-index="204" stop-index="204" />
</right>
</binary-operation-expression>
</right>
@@ -531,7 +531,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="221" stop-index="226" />
- <parameter-marker-expression value="3" start-index="221" stop-index="221" />
+ <parameter-marker-expression parameter-index="3" start-index="221" stop-index="221" />
</right>
</binary-operation-expression>
</right>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination-group-by-order-by.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
index f79d651..e55844e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
@@ -82,11 +82,11 @@
<list-expression start-index="124" stop-index="129">
<items>
<literal-expression value="1" start-index="125" stop-index="125"/>
- <parameter-marker-expression value="0" start-index="125" stop-index="125"/>
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125"/>
</items>
<items>
<literal-expression value="2" start-index="128" stop-index="128"/>
- <parameter-marker-expression value="1" start-index="128" stop-index="128"/>
+ <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128"/>
</items>
</list-expression>
</right>
@@ -103,11 +103,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="154" stop-index="154"/>
- <parameter-marker-expression value="2" start-index="154" stop-index="154"/>
+ <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154"/>
</between-expr>
<and-expr>
<literal-expression value="10" start-index="160" stop-index="161"/>
- <parameter-marker-expression value="3" start-index="160" stop-index="160"/>
+ <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160"/>
</and-expr>
</between-expression>
</right>
@@ -196,11 +196,11 @@
<list-expression start-index="124" stop-index="129">
<items>
<literal-expression value="1" start-index="125" stop-index="125"/>
- <parameter-marker-expression value="0" start-index="125" stop-index="125"/>
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125"/>
</items>
<items>
<literal-expression value="2" start-index="128" stop-index="128"/>
- <parameter-marker-expression value="1" start-index="128" stop-index="128"/>
+ <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128"/>
</items>
</list-expression>
</right>
@@ -217,11 +217,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="154" stop-index="154"/>
- <parameter-marker-expression value="2" start-index="154" stop-index="154"/>
+ <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154"/>
</between-expr>
<and-expr>
<literal-expression value="10" start-index="160" stop-index="161"/>
- <parameter-marker-expression value="3" start-index="160" stop-index="160"/>
+ <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160"/>
</and-expr>
</between-expression>
</right>
@@ -329,11 +329,11 @@
<list-expression start-index="267" stop-index="272">
<items>
<literal-expression value="1" start-index="268" stop-index="268" />
- <parameter-marker-expression value="1" start-index="268" stop-index="268" />
+ <parameter-marker-expression parameter-index="1" start-index="268" stop-index="268" />
</items>
<items>
<literal-expression value="2" start-index="271" stop-index="271" />
- <parameter-marker-expression value="2" start-index="271" stop-index="271" />
+ <parameter-marker-expression parameter-index="2" start-index="271" stop-index="271" />
</items>
</list-expression>
</right>
@@ -350,11 +350,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="297" stop-index="297" />
- <parameter-marker-expression value="3" start-index="297" stop-index="297" />
+ <parameter-marker-expression parameter-index="3" start-index="297" stop-index="297" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="303" stop-index="304" />
- <parameter-marker-expression value="4" start-index="303" stop-index="303" />
+ <parameter-marker-expression parameter-index="4" start-index="303" stop-index="303" />
</and-expr>
</between-expression>
</right>
@@ -381,7 +381,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="355" stop-index="355" />
- <parameter-marker-expression value="5" start-index="354" stop-index="354" />
+ <parameter-marker-expression parameter-index="5" start-index="354" stop-index="354" />
</right>
</binary-operation-expression>
</expr>
@@ -473,11 +473,11 @@
<list-expression start-index="285" stop-index="290">
<items>
<literal-expression value="1" start-index="286" stop-index="286" />
- <parameter-marker-expression value="1" start-index="286" stop-index="286" />
+ <parameter-marker-expression parameter-index="1" start-index="286" stop-index="286" />
</items>
<items>
<literal-expression value="2" start-index="289" stop-index="289" />
- <parameter-marker-expression value="2" start-index="289" stop-index="289" />
+ <parameter-marker-expression parameter-index="2" start-index="289" stop-index="289" />
</items>
</list-expression>
</right>
@@ -494,11 +494,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="315" stop-index="315" />
- <parameter-marker-expression value="3" start-index="315" stop-index="315" />
+ <parameter-marker-expression parameter-index="3" start-index="315" stop-index="315" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="321" stop-index="322" />
- <parameter-marker-expression value="4" start-index="321" stop-index="321" />
+ <parameter-marker-expression parameter-index="4" start-index="321" stop-index="321" />
</and-expr>
</between-expression>
</right>
@@ -525,7 +525,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="373" stop-index="373" />
- <parameter-marker-expression value="5" start-index="372" stop-index="372" />
+ <parameter-marker-expression parameter-index="5" start-index="372" stop-index="372" />
</right>
</binary-operation-expression>
</expr>
@@ -617,11 +617,11 @@
<list-expression start-index="269" stop-index="274">
<items>
<literal-expression value="1" start-index="270" stop-index="270" />
- <parameter-marker-expression value="1" start-index="270" stop-index="270" />
+ <parameter-marker-expression parameter-index="1" start-index="270" stop-index="270" />
</items>
<items>
<literal-expression value="2" start-index="273" stop-index="273" />
- <parameter-marker-expression value="2" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="2" start-index="273" stop-index="273" />
</items>
</list-expression>
</right>
@@ -638,11 +638,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="299" stop-index="299" />
- <parameter-marker-expression value="3" start-index="299" stop-index="299" />
+ <parameter-marker-expression parameter-index="3" start-index="299" stop-index="299" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="305" stop-index="306" />
- <parameter-marker-expression value="4" start-index="305" stop-index="305" />
+ <parameter-marker-expression parameter-index="4" start-index="305" stop-index="305" />
</and-expr>
</between-expression>
</right>
@@ -669,7 +669,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="357" stop-index="357" />
- <parameter-marker-expression value="5" start-index="356" stop-index="356" />
+ <parameter-marker-expression parameter-index="5" start-index="356" stop-index="356" />
</right>
</binary-operation-expression>
</expr>
@@ -761,11 +761,11 @@
<list-expression start-index="287" stop-index="292">
<items>
<literal-expression value="1" start-index="288" stop-index="288" />
- <parameter-marker-expression value="1" start-index="288" stop-index="288" />
+ <parameter-marker-expression parameter-index="1" start-index="288" stop-index="288" />
</items>
<items>
<literal-expression value="2" start-index="291" stop-index="291" />
- <parameter-marker-expression value="2" start-index="291" stop-index="291" />
+ <parameter-marker-expression parameter-index="2" start-index="291" stop-index="291" />
</items>
</list-expression>
</right>
@@ -782,11 +782,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="317" stop-index="317" />
- <parameter-marker-expression value="3" start-index="317" stop-index="317" />
+ <parameter-marker-expression parameter-index="3" start-index="317" stop-index="317" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="323" stop-index="324" />
- <parameter-marker-expression value="4" start-index="323" stop-index="323" />
+ <parameter-marker-expression parameter-index="4" start-index="323" stop-index="323" />
</and-expr>
</between-expression>
</right>
@@ -813,7 +813,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="375" stop-index="375" />
- <parameter-marker-expression value="5" start-index="374" stop-index="374" />
+ <parameter-marker-expression parameter-index="5" start-index="374" stop-index="374" />
</right>
</binary-operation-expression>
</expr>
@@ -905,11 +905,11 @@
<list-expression start-index="267" stop-index="272">
<items>
<literal-expression value="1" start-index="268" stop-index="268" />
- <parameter-marker-expression value="1" start-index="268" stop-index="268" />
+ <parameter-marker-expression parameter-index="1" start-index="268" stop-index="268" />
</items>
<items>
<literal-expression value="2" start-index="271" stop-index="271" />
- <parameter-marker-expression value="2" start-index="271" stop-index="271" />
+ <parameter-marker-expression parameter-index="2" start-index="271" stop-index="271" />
</items>
</list-expression>
</right>
@@ -926,11 +926,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="297" stop-index="297" />
- <parameter-marker-expression value="3" start-index="297" stop-index="297" />
+ <parameter-marker-expression parameter-index="3" start-index="297" stop-index="297" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="303" stop-index="304" />
- <parameter-marker-expression value="4" start-index="303" stop-index="303" />
+ <parameter-marker-expression parameter-index="4" start-index="303" stop-index="303" />
</and-expr>
</between-expression>
</right>
@@ -957,7 +957,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="355" stop-index="355" />
- <parameter-marker-expression value="5" start-index="354" stop-index="354" />
+ <parameter-marker-expression parameter-index="5" start-index="354" stop-index="354" />
</right>
</binary-operation-expression>
</expr>
@@ -1049,11 +1049,11 @@
<list-expression start-index="285" stop-index="290">
<items>
<literal-expression value="1" start-index="286" stop-index="286" />
- <parameter-marker-expression value="1" start-index="286" stop-index="286" />
+ <parameter-marker-expression parameter-index="1" start-index="286" stop-index="286" />
</items>
<items>
<literal-expression value="2" start-index="289" stop-index="289" />
- <parameter-marker-expression value="2" start-index="289" stop-index="289" />
+ <parameter-marker-expression parameter-index="2" start-index="289" stop-index="289" />
</items>
</list-expression>
</right>
@@ -1070,11 +1070,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="315" stop-index="315" />
- <parameter-marker-expression value="3" start-index="315" stop-index="315" />
+ <parameter-marker-expression parameter-index="3" start-index="315" stop-index="315" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="321" stop-index="322" />
- <parameter-marker-expression value="4" start-index="321" stop-index="321" />
+ <parameter-marker-expression parameter-index="4" start-index="321" stop-index="321" />
</and-expr>
</between-expression>
</right>
@@ -1101,7 +1101,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="373" stop-index="373" />
- <parameter-marker-expression value="5" start-index="372" stop-index="372" />
+ <parameter-marker-expression parameter-index="5" start-index="372" stop-index="372" />
</right>
</binary-operation-expression>
</expr>
@@ -1193,11 +1193,11 @@
<list-expression start-index="269" stop-index="274">
<items>
<literal-expression value="1" start-index="270" stop-index="270" />
- <parameter-marker-expression value="1" start-index="270" stop-index="270" />
+ <parameter-marker-expression parameter-index="1" start-index="270" stop-index="270" />
</items>
<items>
<literal-expression value="2" start-index="273" stop-index="273" />
- <parameter-marker-expression value="2" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="2" start-index="273" stop-index="273" />
</items>
</list-expression>
</right>
@@ -1214,11 +1214,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="299" stop-index="299" />
- <parameter-marker-expression value="3" start-index="299" stop-index="299" />
+ <parameter-marker-expression parameter-index="3" start-index="299" stop-index="299" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="305" stop-index="306" />
- <parameter-marker-expression value="4" start-index="305" stop-index="305" />
+ <parameter-marker-expression parameter-index="4" start-index="305" stop-index="305" />
</and-expr>
</between-expression>
</right>
@@ -1245,7 +1245,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="357" stop-index="357" />
- <parameter-marker-expression value="5" start-index="356" stop-index="356" />
+ <parameter-marker-expression parameter-index="5" start-index="356" stop-index="356" />
</right>
</binary-operation-expression>
</expr>
@@ -1337,11 +1337,11 @@
<list-expression start-index="287" stop-index="292">
<items>
<literal-expression value="1" start-index="288" stop-index="288" />
- <parameter-marker-expression value="1" start-index="288" stop-index="288" />
+ <parameter-marker-expression parameter-index="1" start-index="288" stop-index="288" />
</items>
<items>
<literal-expression value="2" start-index="291" stop-index="291" />
- <parameter-marker-expression value="2" start-index="291" stop-index="291" />
+ <parameter-marker-expression parameter-index="2" start-index="291" stop-index="291" />
</items>
</list-expression>
</right>
@@ -1358,11 +1358,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="317" stop-index="317" />
- <parameter-marker-expression value="3" start-index="317" stop-index="317" />
+ <parameter-marker-expression parameter-index="3" start-index="317" stop-index="317" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="323" stop-index="324" />
- <parameter-marker-expression value="4" start-index="323" stop-index="323" />
+ <parameter-marker-expression parameter-index="4" start-index="323" stop-index="323" />
</and-expr>
</between-expression>
</right>
@@ -1389,7 +1389,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="375" stop-index="375" />
- <parameter-marker-expression value="5" start-index="374" stop-index="374" />
+ <parameter-marker-expression parameter-index="5" start-index="374" stop-index="374" />
</right>
</binary-operation-expression>
</expr>
@@ -1485,11 +1485,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1506,11 +1506,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1540,7 +1540,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="381" stop-index="381" />
- <parameter-marker-expression value="4" start-index="381" stop-index="381" />
+ <parameter-marker-expression parameter-index="4" start-index="381" stop-index="381" />
</right>
</binary-operation-expression>
</expr>
@@ -1560,7 +1560,7 @@
<operator>></operator>
<right>
<literal-expression value="3" start-index="404" stop-index="404" />
- <parameter-marker-expression value="5" start-index="404" stop-index="404" />
+ <parameter-marker-expression parameter-index="5" start-index="404" stop-index="404" />
</right>
</binary-operation-expression>
</expr>
@@ -1656,11 +1656,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1677,11 +1677,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1711,7 +1711,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="381" stop-index="381" />
- <parameter-marker-expression value="4" start-index="381" stop-index="381" />
+ <parameter-marker-expression parameter-index="4" start-index="381" stop-index="381" />
</right>
</binary-operation-expression>
</expr>
@@ -1731,7 +1731,7 @@
<operator>></operator>
<right>
<literal-expression value="3" start-index="404" stop-index="404" />
- <parameter-marker-expression value="5" start-index="404" stop-index="404" />
+ <parameter-marker-expression parameter-index="5" start-index="404" stop-index="404" />
</right>
</binary-operation-expression>
</expr>
@@ -1827,11 +1827,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1848,11 +1848,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1882,7 +1882,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="381" stop-index="381" />
- <parameter-marker-expression value="4" start-index="381" stop-index="381" />
+ <parameter-marker-expression parameter-index="4" start-index="381" stop-index="381" />
</right>
</binary-operation-expression>
</expr>
@@ -1902,7 +1902,7 @@
<operator>></operator>
<right>
<literal-expression value="3" start-index="406" stop-index="406" />
- <parameter-marker-expression value="5" start-index="406" stop-index="406" />
+ <parameter-marker-expression parameter-index="5" start-index="406" stop-index="406" />
</right>
</binary-operation-expression>
</expr>
@@ -1998,11 +1998,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -2019,11 +2019,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -2053,7 +2053,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="381" stop-index="381" />
- <parameter-marker-expression value="4" start-index="381" stop-index="381" />
+ <parameter-marker-expression parameter-index="4" start-index="381" stop-index="381" />
</right>
</binary-operation-expression>
</expr>
@@ -2073,7 +2073,7 @@
<operator>></operator>
<right>
<literal-expression value="3" start-index="404" stop-index="404" />
- <parameter-marker-expression value="5" start-index="404" stop-index="404" />
+ <parameter-marker-expression parameter-index="5" start-index="404" stop-index="404" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination.xml
index e802705..ac46c65 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-pagination.xml
@@ -84,11 +84,11 @@
<list-expression start-index="118" stop-index="123">
<items>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</items>
<items>
<literal-expression value="2" start-index="122" stop-index="122" />
- <parameter-marker-expression value="1" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="1" start-index="122" stop-index="122" />
</items>
</list-expression>
</right>
@@ -105,11 +105,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="148" stop-index="148" />
- <parameter-marker-expression value="2" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="2" start-index="148" stop-index="148" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="154" stop-index="155" />
- <parameter-marker-expression value="3" start-index="154" stop-index="154" />
+ <parameter-marker-expression parameter-index="3" start-index="154" stop-index="154" />
</and-expr>
</between-expression>
</right>
@@ -193,11 +193,11 @@
<list-expression start-index="118" stop-index="123">
<items>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</items>
<items>
<literal-expression value="2" start-index="122" stop-index="122" />
- <parameter-marker-expression value="1" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="1" start-index="122" stop-index="122" />
</items>
</list-expression>
</right>
@@ -214,11 +214,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="148" stop-index="148" />
- <parameter-marker-expression value="2" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="2" start-index="148" stop-index="148" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="154" stop-index="155" />
- <parameter-marker-expression value="3" start-index="154" stop-index="154" />
+ <parameter-marker-expression parameter-index="3" start-index="154" stop-index="154" />
</and-expr>
</between-expression>
</right>
@@ -301,11 +301,11 @@
<list-expression start-index="124" stop-index="129">
<items>
<literal-expression value="1" start-index="125" stop-index="125" />
- <parameter-marker-expression value="0" start-index="125" stop-index="125" />
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
</items>
<items>
<literal-expression value="2" start-index="128" stop-index="128" />
- <parameter-marker-expression value="1" start-index="128" stop-index="128" />
+ <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128" />
</items>
</list-expression>
</right>
@@ -322,11 +322,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="156" stop-index="156" />
- <parameter-marker-expression value="2" start-index="156" stop-index="156" />
+ <parameter-marker-expression parameter-index="2" start-index="156" stop-index="156" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="162" stop-index="163" />
- <parameter-marker-expression value="3" start-index="162" stop-index="162" />
+ <parameter-marker-expression parameter-index="3" start-index="162" stop-index="162" />
</and-expr>
</between-expression>
</right>
@@ -410,11 +410,11 @@
<list-expression start-index="124" stop-index="129">
<items>
<literal-expression value="1" start-index="125" stop-index="125" />
- <parameter-marker-expression value="0" start-index="125" stop-index="125" />
+ <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
</items>
<items>
<literal-expression value="2" start-index="128" stop-index="128" />
- <parameter-marker-expression value="1" start-index="128" stop-index="128" />
+ <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128" />
</items>
</list-expression>
</right>
@@ -431,11 +431,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="156" stop-index="156" />
- <parameter-marker-expression value="2" start-index="156" stop-index="156" />
+ <parameter-marker-expression parameter-index="2" start-index="156" stop-index="156" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="162" stop-index="163" />
- <parameter-marker-expression value="3" start-index="162" stop-index="162" />
+ <parameter-marker-expression parameter-index="3" start-index="162" stop-index="162" />
</and-expr>
</between-expression>
</right>
@@ -538,11 +538,11 @@
<list-expression start-index="269" stop-index="274">
<items>
<literal-expression value="1" start-index="270" stop-index="270" />
- <parameter-marker-expression value="1" start-index="270" stop-index="270" />
+ <parameter-marker-expression parameter-index="1" start-index="270" stop-index="270" />
</items>
<items>
<literal-expression value="2" start-index="273" stop-index="273" />
- <parameter-marker-expression value="2" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="2" start-index="273" stop-index="273" />
</items>
</list-expression>
</right>
@@ -559,11 +559,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="299" stop-index="299" />
- <parameter-marker-expression value="3" start-index="299" stop-index="299" />
+ <parameter-marker-expression parameter-index="3" start-index="299" stop-index="299" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="305" stop-index="306" />
- <parameter-marker-expression value="4" start-index="305" stop-index="305" />
+ <parameter-marker-expression parameter-index="4" start-index="305" stop-index="305" />
</and-expr>
</between-expression>
</right>
@@ -661,11 +661,11 @@
<list-expression start-index="287" stop-index="292">
<items>
<literal-expression value="1" start-index="288" stop-index="288" />
- <parameter-marker-expression value="1" start-index="288" stop-index="288" />
+ <parameter-marker-expression parameter-index="1" start-index="288" stop-index="288" />
</items>
<items>
<literal-expression value="2" start-index="291" stop-index="291" />
- <parameter-marker-expression value="2" start-index="291" stop-index="291" />
+ <parameter-marker-expression parameter-index="2" start-index="291" stop-index="291" />
</items>
</list-expression>
</right>
@@ -682,11 +682,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="317" stop-index="317" />
- <parameter-marker-expression value="3" start-index="317" stop-index="317" />
+ <parameter-marker-expression parameter-index="3" start-index="317" stop-index="317" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="323" stop-index="324" />
- <parameter-marker-expression value="4" start-index="323" stop-index="323" />
+ <parameter-marker-expression parameter-index="4" start-index="323" stop-index="323" />
</and-expr>
</between-expression>
</right>
@@ -766,11 +766,11 @@
<list-expression start-index="118" stop-index="123">
<items>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</items>
<items>
<literal-expression value="2" start-index="122" stop-index="122" />
- <parameter-marker-expression value="1" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="1" start-index="122" stop-index="122" />
</items>
</list-expression>
</right>
@@ -787,11 +787,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="148" stop-index="148" />
- <parameter-marker-expression value="2" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="2" start-index="148" stop-index="148" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="154" stop-index="155" />
- <parameter-marker-expression value="3" start-index="154" stop-index="154" />
+ <parameter-marker-expression parameter-index="3" start-index="154" stop-index="154" />
</and-expr>
</between-expression>
</right>
@@ -875,11 +875,11 @@
<list-expression start-index="118" stop-index="123">
<items>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</items>
<items>
<literal-expression value="2" start-index="122" stop-index="122" />
- <parameter-marker-expression value="1" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="1" start-index="122" stop-index="122" />
</items>
</list-expression>
</right>
@@ -896,11 +896,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="148" stop-index="148" />
- <parameter-marker-expression value="2" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="2" start-index="148" stop-index="148" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="154" stop-index="155" />
- <parameter-marker-expression value="3" start-index="154" stop-index="154" />
+ <parameter-marker-expression parameter-index="3" start-index="154" stop-index="154" />
</and-expr>
</between-expression>
</right>
@@ -1002,11 +1002,11 @@
<list-expression start-index="269" stop-index="274">
<items>
<literal-expression value="1" start-index="270" stop-index="270" />
- <parameter-marker-expression value="1" start-index="270" stop-index="270" />
+ <parameter-marker-expression parameter-index="1" start-index="270" stop-index="270" />
</items>
<items>
<literal-expression value="2" start-index="273" stop-index="273" />
- <parameter-marker-expression value="2" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="2" start-index="273" stop-index="273" />
</items>
</list-expression>
</right>
@@ -1023,11 +1023,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="299" stop-index="299" />
- <parameter-marker-expression value="3" start-index="299" stop-index="299" />
+ <parameter-marker-expression parameter-index="3" start-index="299" stop-index="299" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="305" stop-index="306" />
- <parameter-marker-expression value="4" start-index="305" stop-index="305" />
+ <parameter-marker-expression parameter-index="4" start-index="305" stop-index="305" />
</and-expr>
</between-expression>
</right>
@@ -1049,7 +1049,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="338" stop-index="338" />
- <parameter-marker-expression value="5" start-index="337" stop-index="337" />
+ <parameter-marker-expression parameter-index="5" start-index="337" stop-index="337" />
</right>
</binary-operation-expression>
</expr>
@@ -1141,11 +1141,11 @@
<list-expression start-index="287" stop-index="292">
<items>
<literal-expression value="1" start-index="288" stop-index="288" />
- <parameter-marker-expression value="1" start-index="288" stop-index="288" />
+ <parameter-marker-expression parameter-index="1" start-index="288" stop-index="288" />
</items>
<items>
<literal-expression value="2" start-index="291" stop-index="291" />
- <parameter-marker-expression value="2" start-index="291" stop-index="291" />
+ <parameter-marker-expression parameter-index="2" start-index="291" stop-index="291" />
</items>
</list-expression>
</right>
@@ -1162,11 +1162,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="317" stop-index="317" />
- <parameter-marker-expression value="3" start-index="317" stop-index="317" />
+ <parameter-marker-expression parameter-index="3" start-index="317" stop-index="317" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="323" stop-index="324" />
- <parameter-marker-expression value="4" start-index="323" stop-index="323" />
+ <parameter-marker-expression parameter-index="4" start-index="323" stop-index="323" />
</and-expr>
</between-expression>
</right>
@@ -1188,7 +1188,7 @@
<operator>></operator>
<right>
<literal-expression value="6" start-index="356" stop-index="356" />
- <parameter-marker-expression value="5" start-index="355" stop-index="355" />
+ <parameter-marker-expression parameter-index="5" start-index="355" stop-index="355" />
</right>
</binary-operation-expression>
</expr>
@@ -1280,11 +1280,11 @@
<list-expression start-index="269" stop-index="274">
<items>
<literal-expression value="1" start-index="270" stop-index="270" />
- <parameter-marker-expression value="1" start-index="270" stop-index="270" />
+ <parameter-marker-expression parameter-index="1" start-index="270" stop-index="270" />
</items>
<items>
<literal-expression value="2" start-index="273" stop-index="273" />
- <parameter-marker-expression value="2" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="2" start-index="273" stop-index="273" />
</items>
</list-expression>
</right>
@@ -1301,11 +1301,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="299" stop-index="299" />
- <parameter-marker-expression value="3" start-index="299" stop-index="299" />
+ <parameter-marker-expression parameter-index="3" start-index="299" stop-index="299" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="305" stop-index="306" />
- <parameter-marker-expression value="4" start-index="305" stop-index="305" />
+ <parameter-marker-expression parameter-index="4" start-index="305" stop-index="305" />
</and-expr>
</between-expression>
</right>
@@ -1327,7 +1327,7 @@
<operator>>=</operator>
<right>
<literal-expression value="6" start-index="339" stop-index="339" />
- <parameter-marker-expression value="5" start-index="338" stop-index="338" />
+ <parameter-marker-expression parameter-index="5" start-index="338" stop-index="338" />
</right>
</binary-operation-expression>
</expr>
@@ -1419,11 +1419,11 @@
<list-expression start-index="287" stop-index="292">
<items>
<literal-expression value="1" start-index="288" stop-index="288" />
- <parameter-marker-expression value="1" start-index="288" stop-index="288" />
+ <parameter-marker-expression parameter-index="1" start-index="288" stop-index="288" />
</items>
<items>
<literal-expression value="2" start-index="291" stop-index="291" />
- <parameter-marker-expression value="2" start-index="291" stop-index="291" />
+ <parameter-marker-expression parameter-index="2" start-index="291" stop-index="291" />
</items>
</list-expression>
</right>
@@ -1440,11 +1440,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="317" stop-index="317" />
- <parameter-marker-expression value="3" start-index="317" stop-index="317" />
+ <parameter-marker-expression parameter-index="3" start-index="317" stop-index="317" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="323" stop-index="324" />
- <parameter-marker-expression value="4" start-index="323" stop-index="323" />
+ <parameter-marker-expression parameter-index="4" start-index="323" stop-index="323" />
</and-expr>
</between-expression>
</right>
@@ -1466,7 +1466,7 @@
<operator>>=</operator>
<right>
<literal-expression value="6" start-index="357" stop-index="357" />
- <parameter-marker-expression value="5" start-index="356" stop-index="356" />
+ <parameter-marker-expression parameter-index="5" start-index="356" stop-index="356" />
</right>
</binary-operation-expression>
</expr>
@@ -1562,11 +1562,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1583,11 +1583,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1612,7 +1612,7 @@
<operator><=</operator>
<right>
<literal-expression value="3" start-index="362" stop-index="362" />
- <parameter-marker-expression value="4" start-index="362" stop-index="362" />
+ <parameter-marker-expression parameter-index="4" start-index="362" stop-index="362" />
</right>
</binary-operation-expression>
</expr>
@@ -1712,11 +1712,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1733,11 +1733,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1762,7 +1762,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="362" stop-index="362" />
- <parameter-marker-expression value="4" start-index="362" stop-index="362" />
+ <parameter-marker-expression parameter-index="4" start-index="362" stop-index="362" />
</right>
</binary-operation-expression>
</expr>
@@ -1782,7 +1782,7 @@
<operator>></operator>
<right>
<literal-expression value="3" start-index="387" stop-index="387" />
- <parameter-marker-expression value="5" start-index="387" stop-index="387" />
+ <parameter-marker-expression parameter-index="5" start-index="387" stop-index="387" />
</right>
</binary-operation-expression>
</expr>
@@ -1878,11 +1878,11 @@
<list-expression start-index="272" stop-index="277">
<items>
<literal-expression value="1" start-index="273" stop-index="273" />
- <parameter-marker-expression value="0" start-index="273" stop-index="273" />
+ <parameter-marker-expression parameter-index="0" start-index="273" stop-index="273" />
</items>
<items>
<literal-expression value="2" start-index="276" stop-index="276" />
- <parameter-marker-expression value="1" start-index="276" stop-index="276" />
+ <parameter-marker-expression parameter-index="1" start-index="276" stop-index="276" />
</items>
</list-expression>
</right>
@@ -1899,11 +1899,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="308" stop-index="308" />
- <parameter-marker-expression value="2" start-index="308" stop-index="308" />
+ <parameter-marker-expression parameter-index="2" start-index="308" stop-index="308" />
</between-expr>
<and-expr>
<literal-expression value="7" start-index="314" stop-index="314" />
- <parameter-marker-expression value="3" start-index="314" stop-index="314" />
+ <parameter-marker-expression parameter-index="3" start-index="314" stop-index="314" />
</and-expr>
</between-expression>
</right>
@@ -1928,7 +1928,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="362" stop-index="362" />
- <parameter-marker-expression value="4" start-index="362" stop-index="362" />
+ <parameter-marker-expression parameter-index="4" start-index="362" stop-index="362" />
</right>
</binary-operation-expression>
</expr>
@@ -1948,7 +1948,7 @@
<operator>>=</operator>
<right>
<literal-expression value="3" start-index="388" stop-index="388" />
- <parameter-marker-expression value="5" start-index="388" stop-index="388" />
+ <parameter-marker-expression parameter-index="5" start-index="388" stop-index="388" />
</right>
</binary-operation-expression>
</expr>
@@ -1971,7 +1971,7 @@
<operator><=</operator>
<right>
<literal-expression value="20" start-index="38" stop-index="39" />
- <parameter-marker-expression value="0" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-sub-query.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-sub-query.xml
index 22d6628..3788c1a 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-sub-query.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-sub-query.xml
@@ -62,11 +62,11 @@
<list-expression start-index="57" stop-index="62">
<items>
<literal-expression value="3" start-index="58" stop-index="58" />
- <parameter-marker-expression value="0" start-index="58" stop-index="58" />
+ <parameter-marker-expression parameter-index="0" start-index="58" stop-index="58" />
</items>
<items>
<literal-expression value="4" start-index="61" stop-index="61" />
- <parameter-marker-expression value="1" start-index="61" stop-index="61" />
+ <parameter-marker-expression parameter-index="1" start-index="61" stop-index="61" />
</items>
</list-expression>
</right>
@@ -215,7 +215,7 @@
</between-expr>
<and-expr>
<literal-expression value="12" start-index="103" stop-index="104" />
- <parameter-marker-expression value="0" start-index="103" stop-index="103" />
+ <parameter-marker-expression parameter-index="0" start-index="103" stop-index="103" />
</and-expr>
</between-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select.xml
index 79ad43e..b9ea8e1 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select.xml
@@ -124,7 +124,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="54" stop-index="54" />
- <parameter-marker-expression value="0" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="0" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
</left>
@@ -137,7 +137,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="71" stop-index="71" />
- <parameter-marker-expression value="1" start-index="71" stop-index="71" />
+ <parameter-marker-expression parameter-index="1" start-index="71" stop-index="71" />
</right>
</binary-operation-expression>
</right>
@@ -172,7 +172,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="92" stop-index="92" />
- <parameter-marker-expression value="0" start-index="92" stop-index="92" />
+ <parameter-marker-expression parameter-index="0" start-index="92" stop-index="92" />
</right>
</binary-operation-expression>
</left>
@@ -185,7 +185,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="109" stop-index="109" />
- <parameter-marker-expression value="1" start-index="109" stop-index="109" />
+ <parameter-marker-expression parameter-index="1" start-index="109" stop-index="109" />
</right>
</binary-operation-expression>
</right>
@@ -210,7 +210,7 @@
<operator><></operator>
<right>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
@@ -236,7 +236,7 @@
<operator>!=</operator>
<right>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</right>
</binary-operation-expression>
</expr>
@@ -279,11 +279,11 @@
<list-expression start-index="72" stop-index="77" literal-stop-index="87">
<items>
<literal-expression value="100000" start-index="73" stop-index="78" />
- <parameter-marker-expression value="0" start-index="73" stop-index="73" />
+ <parameter-marker-expression parameter-index="0" start-index="73" stop-index="73" />
</items>
<items>
<literal-expression value="100001" start-index="81" stop-index="86" />
- <parameter-marker-expression value="1" start-index="76" stop-index="76" />
+ <parameter-marker-expression parameter-index="1" start-index="76" stop-index="76" />
</items>
</list-expression>
</right>
@@ -329,11 +329,11 @@
</left>
<between-expr>
<literal-expression value="100000" start-index="77" stop-index="82" />
- <parameter-marker-expression value="0" start-index="77" stop-index="77" />
+ <parameter-marker-expression parameter-index="0" start-index="77" stop-index="77" />
</between-expr>
<and-expr>
<literal-expression value="100001" start-index="88" stop-index="93" />
- <parameter-marker-expression value="1" start-index="83" stop-index="83" />
+ <parameter-marker-expression parameter-index="1" start-index="83" stop-index="83" />
</and-expr>
</between-expression>
</right>
@@ -363,7 +363,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="38" stop-index="38" />
- <parameter-marker-expression value="0" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
</right>
</binary-operation-expression>
</left>
@@ -376,7 +376,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="55" stop-index="55" />
- <parameter-marker-expression value="1" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="1" start-index="55" stop-index="55" />
</right>
</binary-operation-expression>
</right>
@@ -403,7 +403,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="38" stop-index="38" />
- <parameter-marker-expression value="0" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
</right>
</binary-operation-expression>
</left>
@@ -416,7 +416,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="55" stop-index="55" />
- <parameter-marker-expression value="1" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="1" start-index="55" stop-index="55" />
</right>
</binary-operation-expression>
</right>
@@ -443,7 +443,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -456,7 +456,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="56" stop-index="56" />
- <parameter-marker-expression value="1" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="1" start-index="56" stop-index="56" />
</right>
</binary-operation-expression>
</right>
@@ -483,11 +483,11 @@
</left>
<between-expr>
<literal-expression value="1" start-index="44" stop-index="44" />
- <parameter-marker-expression value="0" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="44" stop-index="44" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="50" stop-index="51" />
- <parameter-marker-expression value="1" start-index="50" stop-index="50" />
+ <parameter-marker-expression parameter-index="1" start-index="50" stop-index="50" />
</and-expr>
</between-expression>
</left>
@@ -500,11 +500,11 @@
</left>
<between-expr>
<literal-expression value="2" start-index="74" stop-index="74" />
- <parameter-marker-expression value="2" start-index="73" stop-index="73" />
+ <parameter-marker-expression parameter-index="2" start-index="73" stop-index="73" />
</between-expr>
<and-expr>
<literal-expression value="5" start-index="80" stop-index="80" />
- <parameter-marker-expression value="3" start-index="79" stop-index="79" />
+ <parameter-marker-expression parameter-index="3" start-index="79" stop-index="79" />
</and-expr>
</between-expression>
</right>
@@ -539,7 +539,7 @@
<operator>>=</operator>
<right>
<literal-expression value="1" start-index="39" stop-index="39" />
- <parameter-marker-expression value="0" start-index="39" stop-index="39" />
+ <parameter-marker-expression parameter-index="0" start-index="39" stop-index="39" />
</right>
</binary-operation-expression>
</left>
@@ -552,7 +552,7 @@
<operator><=</operator>
<right>
<literal-expression value="10" start-index="56" stop-index="57" />
- <parameter-marker-expression value="1" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="1" start-index="56" stop-index="56" />
</right>
</binary-operation-expression>
</right>
@@ -567,7 +567,7 @@
<operator>>=</operator>
<right>
<literal-expression value="2" start-index="75" stop-index="75" />
- <parameter-marker-expression value="2" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74" />
</right>
</binary-operation-expression>
</right>
@@ -582,7 +582,7 @@
<operator><=</operator>
<right>
<literal-expression value="5" start-index="93" stop-index="93" />
- <parameter-marker-expression value="3" start-index="92" stop-index="92" />
+ <parameter-marker-expression parameter-index="3" start-index="92" stop-index="92" />
</right>
</binary-operation-expression>
</right>
@@ -615,15 +615,15 @@
<list-expression start-index="39" stop-index="47">
<items>
<literal-expression value="1" start-index="40" stop-index="40" />
- <parameter-marker-expression value="0" start-index="40" stop-index="40" />
+ <parameter-marker-expression parameter-index="0" start-index="40" stop-index="40" />
</items>
<items>
<literal-expression value="2" start-index="43" stop-index="43" />
- <parameter-marker-expression value="1" start-index="43" stop-index="43" />
+ <parameter-marker-expression parameter-index="1" start-index="43" stop-index="43" />
</items>
<items>
<literal-expression value="3" start-index="46" stop-index="46" />
- <parameter-marker-expression value="2" start-index="46" stop-index="46" />
+ <parameter-marker-expression parameter-index="2" start-index="46" stop-index="46" />
</items>
</list-expression>
</right>
@@ -640,11 +640,11 @@
<list-expression start-index="65" stop-index="70" literal-stop-index="71">
<items>
<literal-expression value="9" start-index="66" stop-index="66" />
- <parameter-marker-expression value="3" start-index="66" stop-index="66" />
+ <parameter-marker-expression parameter-index="3" start-index="66" stop-index="66" />
</items>
<items>
<literal-expression value="10" start-index="69" stop-index="70" />
- <parameter-marker-expression value="4" start-index="69" stop-index="69" />
+ <parameter-marker-expression parameter-index="4" start-index="69" stop-index="69" />
</items>
</list-expression>
</right>
@@ -679,11 +679,11 @@
<list-expression start-index="40" stop-index="45" literal-stop-index="51">
<items>
<literal-expression value="1000" start-index="41" stop-index="44" />
- <parameter-marker-expression value="0" start-index="41" stop-index="41" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="41" />
</items>
<items>
<literal-expression value="1001" start-index="47" stop-index="50" />
- <parameter-marker-expression value="1" start-index="44" stop-index="44" />
+ <parameter-marker-expression parameter-index="1" start-index="44" stop-index="44" />
</items>
</list-expression>
</right>
@@ -700,11 +700,11 @@
<list-expression start-index="63" stop-index="68" literal-start-index="69" literal-stop-index="80">
<items>
<literal-expression value="1001" start-index="70" stop-index="73" />
- <parameter-marker-expression value="2" start-index="64" stop-index="64" />
+ <parameter-marker-expression parameter-index="2" start-index="64" stop-index="64" />
</items>
<items>
<literal-expression value="1002" start-index="76" stop-index="79" />
- <parameter-marker-expression value="3" start-index="67" stop-index="67" />
+ <parameter-marker-expression parameter-index="3" start-index="67" stop-index="67" />
</items>
</list-expression>
</right>
@@ -758,7 +758,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="46" stop-index="46" />
- <parameter-marker-expression value="0" start-index="46" stop-index="46" />
+ <parameter-marker-expression parameter-index="0" start-index="46" stop-index="46" />
</right>
</binary-operation-expression>
</left>
@@ -773,7 +773,7 @@
<list-expression start-index="64" stop-index="64" literal-stop-index="69">
<items>
<literal-expression value="init" start-index="64" stop-index="69" />
- <parameter-marker-expression value="1" start-index="64" stop-index="64" />
+ <parameter-marker-expression parameter-index="1" start-index="64" stop-index="64" />
</items>
</list-expression>
</right>
@@ -813,7 +813,7 @@
</parameter>
<parameter>
<literal-expression value="init" start-index="80" stop-index="80" literal-start-index="80" literal-stop-index="85" />
- <parameter-marker-expression value="0" start-index="80" stop-index="80" />
+ <parameter-marker-expression parameter-index="0" start-index="80" stop-index="80" />
</parameter>
<parameter>
<literal-expression value="%%" start-index="83" stop-index="86" literal-start-index="88" literal-stop-index="91" />
@@ -838,11 +838,11 @@
<list-expression start-index="106" stop-index="111" literal-start-index="111" literal-stop-index="116">
<items>
<literal-expression value="1" start-index="112" stop-index="112" />
- <parameter-marker-expression value="1" start-index="107" stop-index="107" />
+ <parameter-marker-expression parameter-index="1" start-index="107" stop-index="107" />
</items>
<items>
<literal-expression value="2" start-index="115" stop-index="115" />
- <parameter-marker-expression value="2" start-index="110" stop-index="110" />
+ <parameter-marker-expression parameter-index="2" start-index="110" stop-index="110" />
</items>
</list-expression>
</right>
@@ -861,11 +861,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="141" stop-index="141" />
- <parameter-marker-expression value="3" start-index="136" stop-index="136" />
+ <parameter-marker-expression parameter-index="3" start-index="136" stop-index="136" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="147" stop-index="148" />
- <parameter-marker-expression value="4" start-index="142" stop-index="142" />
+ <parameter-marker-expression parameter-index="4" start-index="142" stop-index="142" />
</and-expr>
</between-expression>
</right>
@@ -873,7 +873,7 @@
</expr>
</where>
</select>
-
+
<select sql-case-id="select_count_like_concat_postgres" parameters="'init', 1, 2, 9, 10">
<from>
<simple-table name="t_order" alias="o" start-index="37" stop-index="45" />
@@ -916,11 +916,11 @@
<list-expression start-index="106" stop-index="111" literal-start-index="111" literal-stop-index="116">
<items>
<literal-expression value="1" start-index="112" stop-index="112" />
- <parameter-marker-expression value="1" start-index="107" stop-index="107" />
+ <parameter-marker-expression parameter-index="1" start-index="107" stop-index="107" />
</items>
<items>
<literal-expression value="2" start-index="115" stop-index="115" />
- <parameter-marker-expression value="2" start-index="110" stop-index="110" />
+ <parameter-marker-expression parameter-index="2" start-index="110" stop-index="110" />
</items>
</list-expression>
</right>
@@ -939,11 +939,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="141" stop-index="141" />
- <parameter-marker-expression value="3" start-index="136" stop-index="136" />
+ <parameter-marker-expression parameter-index="3" start-index="136" stop-index="136" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="147" stop-index="148" />
- <parameter-marker-expression value="4" start-index="142" stop-index="142" />
+ <parameter-marker-expression parameter-index="4" start-index="142" stop-index="142" />
</and-expr>
</between-expression>
</right>
@@ -951,7 +951,7 @@
</expr>
</where>
</select>
-
+
<select sql-case-id="select_like_with_single_quotes" >
<from>
<simple-table name="admin" start-index="15" stop-index="19" />
@@ -977,7 +977,7 @@
</expr>
</where>
</select>
-
+
<select sql-case-id="select_count_tilde_concat" parameters="'init', 1, 2, 9, 10">
<from>
<simple-table name="t_order" alias="o" start-index="37" stop-index="45" />
@@ -1020,11 +1020,11 @@
<list-expression start-index="104" stop-index="109" literal-start-index="109" literal-stop-index="114">
<items>
<literal-expression value="1" start-index="110" stop-index="110" />
- <parameter-marker-expression value="1" start-index="105" stop-index="105" />
+ <parameter-marker-expression parameter-index="1" start-index="105" stop-index="105" />
</items>
<items>
<literal-expression value="2" start-index="113" stop-index="113" />
- <parameter-marker-expression value="2" start-index="108" stop-index="108" />
+ <parameter-marker-expression parameter-index="2" start-index="108" stop-index="108" />
</items>
</list-expression>
</right>
@@ -1043,11 +1043,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="139" stop-index="139" />
- <parameter-marker-expression value="3" start-index="134" stop-index="134" />
+ <parameter-marker-expression parameter-index="3" start-index="134" stop-index="134" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="145" stop-index="146" />
- <parameter-marker-expression value="4" start-index="140" stop-index="140" />
+ <parameter-marker-expression parameter-index="4" start-index="140" stop-index="140" />
</and-expr>
</between-expression>
</right>
@@ -1122,11 +1122,11 @@
<list-expression start-index="118" stop-index="123">
<items>
<literal-expression value="1" start-index="119" stop-index="119" />
- <parameter-marker-expression value="0" start-index="119" stop-index="119" />
+ <parameter-marker-expression parameter-index="0" start-index="119" stop-index="119" />
</items>
<items>
<literal-expression value="2" start-index="122" stop-index="122" />
- <parameter-marker-expression value="1" start-index="122" stop-index="122" />
+ <parameter-marker-expression parameter-index="1" start-index="122" stop-index="122" />
</items>
</list-expression>
</right>
@@ -1143,11 +1143,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="148" stop-index="148" />
- <parameter-marker-expression value="2" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="2" start-index="148" stop-index="148" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="154" stop-index="155" />
- <parameter-marker-expression value="3" start-index="154" stop-index="154" />
+ <parameter-marker-expression parameter-index="3" start-index="154" stop-index="154" />
</and-expr>
</between-expression>
</right>
@@ -1309,11 +1309,11 @@
<list-expression start-index="166" stop-index="171">
<items>
<literal-expression value="1" start-index="167" stop-index="167" />
- <parameter-marker-expression value="0" start-index="167" stop-index="167" />
+ <parameter-marker-expression parameter-index="0" start-index="167" stop-index="167" />
</items>
<items>
<literal-expression value="2" start-index="170" stop-index="170" />
- <parameter-marker-expression value="1" start-index="170" stop-index="170" />
+ <parameter-marker-expression parameter-index="1" start-index="170" stop-index="170" />
</items>
</list-expression>
</right>
@@ -1330,11 +1330,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="196" stop-index="196" />
- <parameter-marker-expression value="2" start-index="196" stop-index="196" />
+ <parameter-marker-expression parameter-index="2" start-index="196" stop-index="196" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="202" stop-index="203" />
- <parameter-marker-expression value="3" start-index="202" stop-index="202" />
+ <parameter-marker-expression parameter-index="3" start-index="202" stop-index="202" />
</and-expr>
</between-expression>
</right>
@@ -1351,7 +1351,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="220" stop-index="225" />
- <parameter-marker-expression value="4" start-index="219" stop-index="219" />
+ <parameter-marker-expression parameter-index="4" start-index="219" stop-index="219" />
</right>
</binary-operation-expression>
</right>
@@ -1455,11 +1455,11 @@
<list-expression start-index="157" stop-index="162">
<items>
<literal-expression value="1" start-index="158" stop-index="158" />
- <parameter-marker-expression value="0" start-index="158" stop-index="158" />
+ <parameter-marker-expression parameter-index="0" start-index="158" stop-index="158" />
</items>
<items>
<literal-expression value="2" start-index="161" stop-index="161" />
- <parameter-marker-expression value="1" start-index="161" stop-index="161" />
+ <parameter-marker-expression parameter-index="1" start-index="161" stop-index="161" />
</items>
</list-expression>
</right>
@@ -1476,11 +1476,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="187" stop-index="187" />
- <parameter-marker-expression value="2" start-index="187" stop-index="187" />
+ <parameter-marker-expression parameter-index="2" start-index="187" stop-index="187" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="193" stop-index="194" />
- <parameter-marker-expression value="3" start-index="193" stop-index="193" />
+ <parameter-marker-expression parameter-index="3" start-index="193" stop-index="193" />
</and-expr>
</between-expression>
</right>
@@ -1497,7 +1497,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="211" stop-index="216" />
- <parameter-marker-expression value="4" start-index="210" stop-index="210" />
+ <parameter-marker-expression parameter-index="4" start-index="210" stop-index="210" />
</right>
</binary-operation-expression>
</right>
@@ -1601,11 +1601,11 @@
<list-expression start-index="157" stop-index="162">
<items>
<literal-expression value="1" start-index="158" stop-index="158" />
- <parameter-marker-expression value="0" start-index="158" stop-index="158" />
+ <parameter-marker-expression parameter-index="0" start-index="158" stop-index="158" />
</items>
<items>
<literal-expression value="2" start-index="161" stop-index="161" />
- <parameter-marker-expression value="1" start-index="161" stop-index="161" />
+ <parameter-marker-expression parameter-index="1" start-index="161" stop-index="161" />
</items>
</list-expression>
</right>
@@ -1622,11 +1622,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="187" stop-index="187" />
- <parameter-marker-expression value="2" start-index="187" stop-index="187" />
+ <parameter-marker-expression parameter-index="2" start-index="187" stop-index="187" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="193" stop-index="194" />
- <parameter-marker-expression value="3" start-index="193" stop-index="193" />
+ <parameter-marker-expression parameter-index="3" start-index="193" stop-index="193" />
</and-expr>
</between-expression>
</right>
@@ -1643,7 +1643,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="211" stop-index="216" />
- <parameter-marker-expression value="4" start-index="210" stop-index="210" />
+ <parameter-marker-expression parameter-index="4" start-index="210" stop-index="210" />
</right>
</binary-operation-expression>
</right>
@@ -1747,11 +1747,11 @@
<list-expression start-index="157" stop-index="162">
<items>
<literal-expression value="1" start-index="158" stop-index="158" />
- <parameter-marker-expression value="0" start-index="158" stop-index="158" />
+ <parameter-marker-expression parameter-index="0" start-index="158" stop-index="158" />
</items>
<items>
<literal-expression value="2" start-index="161" stop-index="161" />
- <parameter-marker-expression value="1" start-index="161" stop-index="161" />
+ <parameter-marker-expression parameter-index="1" start-index="161" stop-index="161" />
</items>
</list-expression>
</right>
@@ -1768,11 +1768,11 @@
</left>
<between-expr>
<literal-expression value="9" start-index="187" stop-index="187" />
- <parameter-marker-expression value="2" start-index="187" stop-index="187" />
+ <parameter-marker-expression parameter-index="2" start-index="187" stop-index="187" />
</between-expr>
<and-expr>
<literal-expression value="10" start-index="193" stop-index="194" />
- <parameter-marker-expression value="3" start-index="193" stop-index="193" />
+ <parameter-marker-expression parameter-index="3" start-index="193" stop-index="193" />
</and-expr>
</between-expression>
</right>
@@ -1789,7 +1789,7 @@
<operator>=</operator>
<right>
<literal-expression value="init" start-index="211" stop-index="216" />
- <parameter-marker-expression value="4" start-index="210" stop-index="210" />
+ <parameter-marker-expression parameter-index="4" start-index="210" stop-index="210" />
</right>
</binary-operation-expression>
</right>
@@ -1823,7 +1823,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="79" stop-index="79" />
- <parameter-marker-expression value="0" start-index="79" stop-index="79" />
+ <parameter-marker-expression parameter-index="0" start-index="79" stop-index="79" />
</right>
</binary-operation-expression>
</expr>
@@ -1872,7 +1872,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="115" stop-index="118" />
- <parameter-marker-expression value="0" start-index="115" stop-index="115" />
+ <parameter-marker-expression parameter-index="0" start-index="115" stop-index="115" />
</right>
</binary-operation-expression>
</expr>
@@ -1901,7 +1901,7 @@
<operator>=</operator>
<right>
<common-expression text="'{"rule2":"null2"}'::jsonb" start-index="35" stop-index="60" />
- <parameter-marker-expression value="0" start-index="35" stop-index="42" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="42" />
</right>
</binary-operation-expression>
</left>
@@ -1928,7 +1928,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="153" stop-index="153" />
- <parameter-marker-expression value="3" start-index="131" stop-index="131" />
+ <parameter-marker-expression parameter-index="3" start-index="131" stop-index="131" />
</right>
</binary-operation-expression>
</right>
@@ -1943,7 +1943,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="170" stop-index="170" />
- <parameter-marker-expression value="4" start-index="148" stop-index="148" />
+ <parameter-marker-expression parameter-index="4" start-index="148" stop-index="148" />
</right>
</binary-operation-expression>
</right>
@@ -1976,11 +1976,11 @@
<list-expression start-index="36" stop-index="55" literal-stop-index="91">
<items>
<common-expression text="'{"rule2":"null2"}'::jsonb" start-index="37" stop-index="62" />
- <parameter-marker-expression value="0" start-index="37" stop-index="44" />
+ <parameter-marker-expression parameter-index="0" start-index="37" stop-index="44" />
</items>
<items>
<common-expression text="'{"rule3":"null3"}'::jsonb" start-index="65" stop-index="90" />
- <parameter-marker-expression value="1" start-index="47" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="47" stop-index="54" />
</items>
</list-expression>
</right>
@@ -2009,7 +2009,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="184" stop-index="184" />
- <parameter-marker-expression value="4" start-index="144" stop-index="144" />
+ <parameter-marker-expression parameter-index="4" start-index="144" stop-index="144" />
</right>
</binary-operation-expression>
</right>
@@ -2024,7 +2024,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="201" stop-index="201" />
- <parameter-marker-expression value="5" start-index="161" stop-index="161" />
+ <parameter-marker-expression parameter-index="5" start-index="161" stop-index="161" />
</right>
</binary-operation-expression>
</right>
@@ -2052,7 +2052,7 @@
<column name="rule" start-index="28" stop-index="31" />
</left>
<between-expr>
- <parameter-marker-expression value="0" start-index="41" stop-index="48" />
+ <parameter-marker-expression parameter-index="0" start-index="41" stop-index="48" />
<binary-operation-expression start-index="41" stop-index="66">
<left>
<literal-expression value="{"rule2":"null2"}" start-index="41" stop-index="59" />
@@ -2065,7 +2065,7 @@
</between-expr>
<and-expr>
<common-expression text="'{"rule3":"null3"}'::jsonb" start-index="72" stop-index="97" />
- <parameter-marker-expression value="1" start-index="54" stop-index="61" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="61" />
</and-expr>
</between-expression>
</left>
@@ -2092,7 +2092,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="191" stop-index="191" />
- <parameter-marker-expression value="4" start-index="151" stop-index="151" />
+ <parameter-marker-expression parameter-index="4" start-index="151" stop-index="151" />
</right>
</binary-operation-expression>
</right>
@@ -2117,7 +2117,7 @@
<operator>!=</operator>
<right>
<literal-expression value="1" start-index="48" stop-index="48" />
- <parameter-marker-expression value="0" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48" />
</right>
</binary-operation-expression>
</expr>
@@ -2700,7 +2700,7 @@
<operator>=</operator>
<right>
<literal-expression value="12" start-index="72" stop-index="73" />
- <parameter-marker-expression value="0" start-index="72" stop-index="72" />
+ <parameter-marker-expression parameter-index="0" start-index="72" stop-index="72" />
</right>
</binary-operation-expression>
</left>
@@ -2713,7 +2713,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="90" stop-index="93" />
- <parameter-marker-expression value="1" start-index="89" stop-index="89" />
+ <parameter-marker-expression parameter-index="1" start-index="89" stop-index="89" />
</right>
</binary-operation-expression>
</right>
@@ -2754,7 +2754,7 @@
<operator>=</operator>
<right>
<literal-expression value="12" start-index="69" stop-index="70" />
- <parameter-marker-expression value="0" start-index="69" stop-index="69" />
+ <parameter-marker-expression parameter-index="0" start-index="69" stop-index="69" />
</right>
</binary-operation-expression>
</left>
@@ -2767,7 +2767,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="87" stop-index="90" />
- <parameter-marker-expression value="1" start-index="86" stop-index="86" />
+ <parameter-marker-expression parameter-index="1" start-index="86" stop-index="86" />
</right>
</binary-operation-expression>
</right>
@@ -2955,7 +2955,7 @@
<operator>=</operator>
<right>
<literal-expression value="10" start-index="122" stop-index="123" />
- <parameter-marker-expression value="1" start-index="116" stop-index="116" />
+ <parameter-marker-expression parameter-index="1" start-index="116" stop-index="116" />
</right>
</binary-operation-expression>
</right>
@@ -3903,7 +3903,7 @@
</left>
<operator>=</operator>
<right>
- <parameter-marker-expression value="1" start-index="45" stop-index="46" />
+ <parameter-marker-expression parameter-index="1" start-index="45" stop-index="46" />
<literal-expression value="12" start-index="45" stop-index="46" />
</right>
</binary-operation-expression>
@@ -3916,7 +3916,7 @@
</left>
<operator>=</operator>
<right>
- <parameter-marker-expression value="0" start-index="63" stop-index="64" literal-stop-index="63" />
+ <parameter-marker-expression parameter-index="0" start-index="63" stop-index="64" literal-stop-index="63" />
<literal-expression value="1" start-index="63" stop-index="63" />
</right>
</binary-operation-expression>
@@ -3931,7 +3931,7 @@
</left>
<operator>=</operator>
<right>
- <parameter-marker-expression value="1" start-index="79" stop-index="80" literal-start-index="78" literal-stop-index="79" />
+ <parameter-marker-expression parameter-index="1" start-index="79" stop-index="80" literal-start-index="78" literal-stop-index="79" />
<literal-expression value="12" start-index="78" stop-index="79" />
</right>
</binary-operation-expression>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/update.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/update.xml
index 34217f5..adf62ef 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/update.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/update.xml
@@ -25,7 +25,7 @@
<assignment start-index="19" stop-index="28" literal-stop-index="35">
<column name="status" start-index="19" stop-index="24" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="28" stop-index="28" />
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
<literal-expression value="update" start-index="28" stop-index="35" />
</assignment-value>
</assignment>
@@ -41,7 +41,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="54" stop-index="54" />
- <parameter-marker-expression value="1" start-index="47" stop-index="47" />
+ <parameter-marker-expression parameter-index="1" start-index="47" stop-index="47" />
</right>
</binary-operation-expression>
</left>
@@ -54,7 +54,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="70" stop-index="70" />
- <parameter-marker-expression value="2" start-index="63" stop-index="63" />
+ <parameter-marker-expression parameter-index="2" start-index="63" stop-index="63" />
</right>
</binary-operation-expression>
</right>
@@ -73,7 +73,7 @@
<owner name="o" start-index="24" stop-index="24" />
</column>
<assignment-value>
- <parameter-marker-expression value="0" start-index="35" stop-index="35" />
+ <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
<literal-expression value="update" start-index="35" stop-index="42" />
</assignment-value>
</assignment>
@@ -91,7 +91,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="63" stop-index="63" />
- <parameter-marker-expression value="1" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="1" start-index="56" stop-index="56" />
</right>
</binary-operation-expression>
</left>
@@ -106,7 +106,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="81" stop-index="81" />
- <parameter-marker-expression value="2" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74" />
</right>
</binary-operation-expression>
</right>
@@ -123,7 +123,7 @@
<assignment start-index="24" stop-index="33" literal-stop-index="40">
<column name="status" start-index="24" stop-index="29" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="33" stop-index="33" />
+ <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
<literal-expression value="update" start-index="33" stop-index="40" />
</assignment-value>
</assignment>
@@ -141,7 +141,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="61" stop-index="61" />
- <parameter-marker-expression value="1" start-index="54" stop-index="54" />
+ <parameter-marker-expression parameter-index="1" start-index="54" stop-index="54" />
</right>
</binary-operation-expression>
</left>
@@ -156,7 +156,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="79" stop-index="79" />
- <parameter-marker-expression value="2" start-index="72" stop-index="72" />
+ <parameter-marker-expression parameter-index="2" start-index="72" stop-index="72" />
</right>
</binary-operation-expression>
</right>
@@ -173,7 +173,7 @@
<assignment start-index="19" stop-index="32" literal-stop-index="43">
<column name="start_time" start-index="19" stop-index="28" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="32" stop-index="32" />
+ <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
<literal-expression value="2017-06-07" start-index="32" stop-index="43" />
</assignment-value>
</assignment>
@@ -193,21 +193,21 @@
<assignment start-index="119" stop-index="133" literal-start-index="134" literal-stop-index="166">
<column name="rule" start-index="119" stop-index="122" literal-start-index="134" literal-stop-index="137" />
<assignment-value>
- <parameter-marker-expression value="3" start-index="126" stop-index="133" />
+ <parameter-marker-expression parameter-index="3" start-index="126" stop-index="133" />
<literal-expression value="{"rule2":"null2"}'::json" start-index="141" stop-index="166" />
</assignment-value>
</assignment>
<assignment start-index="136" stop-index="152" literal-start-index="169" literal-stop-index="185">
<column name="discount_type" start-index="136" stop-index="148" literal-start-index="169" literal-stop-index="181" />
<assignment-value>
- <parameter-marker-expression value="4" start-index="152" stop-index="152" />
+ <parameter-marker-expression parameter-index="4" start-index="152" stop-index="152" />
<literal-expression value="3" start-index="185" stop-index="185" />
</assignment-value>
</assignment>
<assignment start-index="155" stop-index="168" literal-start-index="188" literal-stop-index="201">
<column name="order_type" start-index="155" stop-index="164" literal-start-index="188" literal-stop-index="197" />
<assignment-value>
- <parameter-marker-expression value="5" start-index="168" stop-index="168" />
+ <parameter-marker-expression parameter-index="5" start-index="168" stop-index="168" />
<literal-expression value="5" start-index="201" stop-index="201" />
</assignment-value>
</assignment>
@@ -223,7 +223,7 @@
<operator>=</operator>
<right>
<literal-expression value="7" start-index="219" stop-index="219" />
- <parameter-marker-expression value="6" start-index="186" stop-index="186" />
+ <parameter-marker-expression parameter-index="6" start-index="186" stop-index="186" />
</right>
</binary-operation-expression>
</left>
@@ -236,7 +236,7 @@
<operator>=</operator>
<right>
<literal-expression value="200" start-index="236" stop-index="238" />
- <parameter-marker-expression value="7" start-index="203" stop-index="203" />
+ <parameter-marker-expression parameter-index="7" start-index="203" stop-index="203" />
</right>
</binary-operation-expression>
</right>
@@ -269,7 +269,7 @@
<assignment start-index="39" stop-index="48" literal-start-index="39" literal-stop-index="55">
<column name="status" start-index="39" stop-index="44" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48" />
<literal-expression value="update" start-index="48" stop-index="55" />
</assignment-value>
</assignment>
@@ -285,7 +285,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="74" stop-index="74" />
- <parameter-marker-expression value="1" start-index="67" stop-index="67" />
+ <parameter-marker-expression parameter-index="1" start-index="67" stop-index="67" />
</right>
</binary-operation-expression>
</left>
@@ -298,7 +298,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="90" stop-index="90" />
- <parameter-marker-expression value="2" start-index="83" stop-index="83" />
+ <parameter-marker-expression parameter-index="2" start-index="83" stop-index="83" />
</right>
</binary-operation-expression>
</right>
@@ -315,7 +315,7 @@
<assignment start-index="21" stop-index="32" literal-stop-index="39">
<column name="status" start-delimiter="`" end-delimiter="`" start-index="21" stop-index="28" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="32" stop-index="32" />
+ <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
<literal-expression value="update" start-index="32" stop-index="39" />
</assignment-value>
</assignment>
@@ -331,7 +331,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="60" stop-index="60" />
- <parameter-marker-expression value="1" start-index="53" stop-index="53" />
+ <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
</right>
</binary-operation-expression>
</left>
@@ -344,7 +344,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="76" stop-index="76" />
- <parameter-marker-expression value="2" start-index="69" stop-index="69" />
+ <parameter-marker-expression parameter-index="2" start-index="69" stop-index="69" />
</right>
</binary-operation-expression>
</right>
@@ -421,7 +421,7 @@
<operator>=</operator>
<right>
<literal-expression value="1000" start-index="55" stop-index="58" />
- <parameter-marker-expression value="0" start-index="55" stop-index="55" />
+ <parameter-marker-expression parameter-index="0" start-index="55" stop-index="55" />
</right>
</binary-operation-expression>
</left>
@@ -434,7 +434,7 @@
<operator>=</operator>
<right>
<literal-expression value="0" start-index="74" stop-index="74" />
- <parameter-marker-expression value="1" start-index="71" stop-index="71" />
+ <parameter-marker-expression parameter-index="1" start-index="71" stop-index="71" />
</right>
</binary-operation-expression>
</right>
@@ -449,7 +449,7 @@
<operator>=</operator>
<right>
<literal-expression value="10" start-index="91" stop-index="92" />
- <parameter-marker-expression value="2" start-index="88" stop-index="88" />
+ <parameter-marker-expression parameter-index="2" start-index="88" stop-index="88" />
</right>
</binary-operation-expression>
</right>
@@ -481,7 +481,7 @@
<operator>=</operator>
<right>
<literal-expression value="2" start-index="56" stop-index="56" />
- <parameter-marker-expression value="1" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="1" start-index="56" stop-index="56" />
</right>
</binary-operation-expression>
</left>
@@ -494,7 +494,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="72" stop-index="72" />
- <parameter-marker-expression value="2" start-index="72" stop-index="72" />
+ <parameter-marker-expression parameter-index="2" start-index="72" stop-index="72" />
</right>
</binary-operation-expression>
</right>
@@ -511,7 +511,7 @@
<assignment start-index="19" stop-index="28" literal-stop-index="28">
<column name="status" start-index="19" stop-index="24" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="28" stop-index="28" />
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
<literal-expression value="1" start-index="28" stop-index="28" />
</assignment-value>
</assignment>
@@ -533,7 +533,7 @@
<operator>-</operator>
<right>
<literal-expression value="2" start-index="58" stop-index="58" />
- <parameter-marker-expression value="1" start-index="58" stop-index="58" />
+ <parameter-marker-expression parameter-index="1" start-index="58" stop-index="58" />
</right>
</binary-operation-expression>
<common-expression text="order_id - ?" literal-text="order_id - 2" start-index="47" stop-index="58" />
@@ -549,7 +549,7 @@
<operator>=</operator>
<right>
<literal-expression value="3" start-index="74" stop-index="74" />
- <parameter-marker-expression value="2" start-index="74" stop-index="74" />
+ <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74" />
</right>
</binary-operation-expression>
</right>
@@ -600,7 +600,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="97" stop-index="97" />
- <parameter-marker-expression value="0" start-index="97" stop-index="97" />
+ <parameter-marker-expression parameter-index="0" start-index="97" stop-index="97" />
</right>
</binary-operation-expression>
</right>
@@ -642,7 +642,7 @@
<operator>=</operator>
<right>
<literal-expression value="jd" start-index="291" stop-index="294" />
- <parameter-marker-expression value="14" start-index="251" stop-index="251" />
+ <parameter-marker-expression parameter-index="14" start-index="251" stop-index="251" />
</right>
</binary-operation-expression>
</expr>
@@ -657,7 +657,7 @@
<assignment start-index="19" stop-index="28" literal-stop-index="35">
<column name="status" start-index="19" stop-index="24" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="28" stop-index="28" />
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
<literal-expression value="update" start-index="28" stop-index="35" />
</assignment-value>
</assignment>
@@ -673,7 +673,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="54" stop-index="54" />
- <parameter-marker-expression value="1" start-index="47" stop-index="47" />
+ <parameter-marker-expression parameter-index="1" start-index="47" stop-index="47" />
</right>
</binary-operation-expression>
</left>
@@ -686,7 +686,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="70" stop-index="70" />
- <parameter-marker-expression value="2" start-index="63" stop-index="63" />
+ <parameter-marker-expression parameter-index="2" start-index="63" stop-index="63" />
</right>
</binary-operation-expression>
</right>
@@ -709,7 +709,7 @@
<assignment start-index="19" stop-index="30" literal-stop-index="30">
<column name="order_id" start-index="19" stop-index="26" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="30" stop-index="30" />
+ <parameter-marker-expression parameter-index="0" start-index="30" stop-index="30" />
<literal-expression value="1" start-index="30" stop-index="30" />
</assignment-value>
</assignment>
@@ -723,7 +723,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="48" stop-index="48" />
- <parameter-marker-expression value="1" start-index="48" stop-index="48" />
+ <parameter-marker-expression parameter-index="1" start-index="48" stop-index="48" />
</right>
</binary-operation-expression>
</expr>
@@ -759,7 +759,7 @@
<assignment start-index="107" stop-index="116" literal-stop-index="116">
<column name="status" start-index="107" stop-index="112" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="116" stop-index="116" />
+ <parameter-marker-expression parameter-index="0" start-index="116" stop-index="116" />
<literal-expression value="1" start-index="116" stop-index="116" />
</assignment-value>
</assignment>
@@ -775,7 +775,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="196" stop-index="196" />
- <parameter-marker-expression value="1" start-index="196" stop-index="196" />
+ <parameter-marker-expression parameter-index="1" start-index="196" stop-index="196" />
</right>
</binary-operation-expression>
</expr>
@@ -790,7 +790,7 @@
<assignment start-index="27" stop-index="38" literal-stop-index="38">
<column name="order_id" start-index="27" stop-index="34" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="38" stop-index="38" />
+ <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
<literal-expression value="1" start-index="38" stop-index="38" />
</assignment-value>
</assignment>
@@ -804,7 +804,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="56" stop-index="56" />
- <parameter-marker-expression value="1" start-index="56" stop-index="56" />
+ <parameter-marker-expression parameter-index="1" start-index="56" stop-index="56" />
</right>
</binary-operation-expression>
</expr>
@@ -819,7 +819,7 @@
<assignment start-index="35" stop-index="46" literal-stop-index="46">
<column name="order_id" start-index="35" stop-index="42" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="46" stop-index="46" />
+ <parameter-marker-expression parameter-index="0" start-index="46" stop-index="46" />
<literal-expression value="1" start-index="46" stop-index="46" />
</assignment-value>
</assignment>
@@ -833,7 +833,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="64" stop-index="64" />
- <parameter-marker-expression value="1" start-index="64" stop-index="64" />
+ <parameter-marker-expression parameter-index="1" start-index="64" stop-index="64" />
</right>
</binary-operation-expression>
</expr>
@@ -848,7 +848,7 @@
<assignment start-index="19" stop-index="28" literal-stop-index="35">
<column name="status" start-index="19" stop-index="24" />
<assignment-value>
- <parameter-marker-expression value="0" start-index="28" stop-index="28" />
+ <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
<literal-expression value="update" start-index="28" stop-index="35" />
</assignment-value>
</assignment>
@@ -862,7 +862,7 @@
<operator>=</operator>
<right>
<literal-expression value="1" start-index="54" stop-index="54" />
- <parameter-marker-expression value="1" start-index="47" stop-index="47" />
+ <parameter-marker-expression parameter-index="1" start-index="47" stop-index="47" />
</right>
</binary-operation-expression>
</expr>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
index 8e6573a..0c62610 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
@@ -87,4 +87,5 @@
<sql-case id="select_with_regular_function" value="SELECT A(1) FROM t_order WHERE A(1) = 1 GROUP BY A(order_id) ORDER BY A(order_id)" db-types="MySQL,Oracle,SQLServer" />
<sql-case id="select_with_regular_function_for_sql92" value="SELECT A(1) FROM t_order WHERE A(1) = 1" db-types="MySQL,Oracle,SQLServer,H2,SQL92" />
<sql-case id="select_with_regular_function_utc_timestamp" value="SELECT TIMEDIFF(NOW(), UTC_TIMESTAMP())" db-types="MySQL" />
+ <sql-case id="select_with_collate_with_marker" value="SELECT * FROM t_order WHERE order_id COLLATE ?" db-types="MySQL"/>
</sql-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
index 146eb95..e9109f9 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
@@ -17,8 +17,7 @@
-->
<sql-cases>
- <sql-case id="assert_select_into_SQL" value="SELECT * INTO t_order_new FROM t_order" db-types="MySQL,Oracle" />
- <sql-case id="assert_select_with_collate_with_marker" value="NOT SUPPORT SELECT * FROM t_order WHERE order_id collate ?" db-types="MySQL"/>
+ <sql-case id="assert_select_into_SQL" value="SELECT * INTO t_order_new FROM t_order" db-types="Oracle" />
<sql-case id="assert_select_with_json_extract_sign_with_parameter_marker" value="SELECT * FROM t_order WHERE order_id -> ?" db-types="MySQL"/>
<sql-case id="assert_select_with_json_unquote_extract_sign_with_parameter_marker" value="SELECT * FROM t_order WHERE order_id ->> ?" db-types="MySQL"/>
<sql-case id="assert_insert_with_first" value="INSERT FIRST INTO TABLE_XXX (field1) VALUES (field1) SELECT field1 FROM TABLE_XXX2" db-types="Oracle" />