Commit 37a92d86 authored by terrymanu's avatar terrymanu
Browse files

for #2084, SQLStatement.increaseParametersIndex => setParametersIndex

parent 8fa6543c

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptWhereFiller.java

+1 −5
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ public class EncryptWhereFiller implements SQLSegmentFiller<WhereSegment>, Encry 
    @Override

    public void fill(final WhereSegment sqlSegment, final SQLStatement sqlStatement) {

        new EncryptOrConditionFiller(encryptRule, shardingTableMetaData).fill(sqlSegment.getConditions(), sqlStatement);

        int count = 0;

        while (count < sqlSegment.getParameterCount()) {

            sqlStatement.increaseParametersIndex();

            count++;

        }

        sqlStatement.setParametersIndex(sqlSegment.getParameterCount());

        if (sqlStatement instanceof DeleteStatement) {

            DeleteStatement deleteStatement = (DeleteStatement) sqlStatement;

            deleteStatement.setWhereStartIndex(sqlSegment.getWhereStartIndex());

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/WhereFiller.java

+1 −5
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ public class WhereFiller implements SQLSegmentFiller<WhereSegment>, ShardingRule 
    @Override

    public void fill(final WhereSegment sqlSegment, final SQLStatement sqlStatement) {

        new OrConditionFiller(shardingRule, shardingTableMetaData).fill(sqlSegment.getConditions(), sqlStatement);

        int count = 0;

        while (count < sqlSegment.getParameterCount()) {

            sqlStatement.increaseParametersIndex();

            count++;

        }

        sqlStatement.setParametersIndex(sqlSegment.getParameterCount());

        if (sqlStatement instanceof DeleteStatement) {

            DeleteStatement deleteStatement = (DeleteStatement) sqlStatement;

            deleteStatement.setWhereStartIndex(sqlSegment.getWhereStartIndex());

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/sql/statement/AbstractSQLStatement.java

+0 −5
Original line number Diff line number Diff line
@@ -80,9 +80,4 @@ public abstract class AbstractSQLStatement implements SQLStatement { 
        Collections.sort(sqlTokens);

        return sqlTokens;

    }

    

    @Override

    public final void increaseParametersIndex() {

        ++parametersIndex;

    }

}

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/sql/statement/SQLStatement.java

+4 −2
Original line number Diff line number Diff line
@@ -91,9 +91,11 @@ public interface SQLStatement { 
    int getParametersIndex();

    

    /**

     * Increase parameters index.

     * Set parameters index.

     * 

     * @param parametersIndex parameters index

     */

    void increaseParametersIndex();

    void setParametersIndex(int parametersIndex);

    

    /**

     * Get logic SQL.

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/old/lexer/LexerEngine.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public final class LexerEngine { 
            lexer.nextToken();

            while (true) {

                if (equalAny(Symbol.QUESTION)) {

                    sqlStatement.increaseParametersIndex();

                    sqlStatement.setParametersIndex(sqlStatement.getParametersIndex() + 1);

                }

                if (Assist.END == lexer.getCurrentToken().getType() || (Symbol.RIGHT_PAREN == lexer.getCurrentToken().getType() && 0 == count)) {

                    break;