for #701: fix bug for limit parse parameters index incorrect

apache · Apr 5, 2018 · 1aee4f3 · 1aee4f3
1 parent 6602ade
commit 1aee4f3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/...java/io/shardingjdbc/core/parsing/parser/dialect/mysql/clause/MySQLLimitClauseParser.java b/...java/io/shardingjdbc/core/parsing/parser/dialect/mysql/clause/MySQLLimitClauseParser.java
@@ -74,7 +74,9 @@ public void parse(final SelectStatement selectStatement) {
             selectStatement.setLimit(getLimitWithOffset(valueIndex, valueBeginPosition, value, isParameterForValue, selectStatement));
             return;
         }
-        if (!isParameterForValue) {
+        if (isParameterForValue) {
+            selectStatement.increaseParametersIndex();
+        } else {
             selectStatement.getSqlTokens().add(new RowCountToken(valueBeginPosition, value));
         }
         Limit limit = new Limit(DatabaseType.MySQL);
@@ -99,10 +101,14 @@ private Limit getLimitWithComma(final int index, final int valueBeginPosition, f
             throw new SQLParsingException(lexerEngine);
         }
         lexerEngine.nextToken();
-        if (!isParameterForValue) {
+        if (isParameterForValue) {
+            selectStatement.increaseParametersIndex();
+        } else {
             selectStatement.getSqlTokens().add(new OffsetToken(valueBeginPosition, value));
         }
-        if (!isParameterForRowCount) {
+        if (isParameterForRowCount) {
+            selectStatement.increaseParametersIndex();
+        } else {
             selectStatement.getSqlTokens().add(new RowCountToken(rowCountBeginPosition, rowCountValue));
         }
         Limit result = new Limit(DatabaseType.MySQL);
@@ -127,10 +133,14 @@ private Limit getLimitWithOffset(final int index, final int valueBeginPosition,
             throw new SQLParsingException(lexerEngine);
         }
         lexerEngine.nextToken();
-        if (!isParameterForOffset) {
+        if (isParameterForOffset) {
+            selectStatement.increaseParametersIndex();
+        } else {
             selectStatement.getSqlTokens().add(new OffsetToken(offsetBeginPosition, offsetValue));
         }
-        if (!isParameterForValue) {
+        if (isParameterForValue) {
+            selectStatement.increaseParametersIndex();
+        } else {
             selectStatement.getSqlTokens().add(new RowCountToken(valueBeginPosition, value));
         }
         Limit result = new Limit(DatabaseType.MySQL);

diff --git a/...ore/src/main/java/io/shardingjdbc/core/parsing/parser/sql/dql/select/SelectStatement.java b/...ore/src/main/java/io/shardingjdbc/core/parsing/parser/sql/dql/select/SelectStatement.java
@@ -177,6 +177,7 @@ public SelectStatement mergeSubQueryStatement() {
         SelectStatement result = processLimitForSubQuery();
         processItems(result);
         processOrderByItems(result);
+        result.setParametersIndex(getParametersIndex());
         return result;
     }