Commit a12f75d6 authored by terrymanu's avatar terrymanu
Browse files

for #2084, remove AbstractWhereExtractor.extract for 2 parameters

parent ed7d99d8

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/AbstractWhereExtractor.java

+0 −11
Original line number Diff line number Diff line
@@ -45,17 +45,6 @@ public abstract class AbstractWhereExtractor implements OptionalSQLSegmentExtrac 
    

    @Override

    public final Optional<WhereSegment> extract(final ParserRuleContext ancestorNode) {

        return extract(ancestorNode, ancestorNode);

    }

    

    /**

     * Extract SQL segment from SQL AST.

     *

     * @param ancestorNode ancestor node of AST

     * @param rootNode root node of AST

     * @return SQL segment

     */

    public Optional<WhereSegment> extract(final ParserRuleContext ancestorNode, final ParserRuleContext rootNode) {

        WhereSegment result = new WhereSegment();

        result.setParameterCount(placeholderIndexes.size());

        Optional<ParserRuleContext> whereNode = extractWhere(ancestorNode);

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/antlr/extractor/impl/dml/select/SubqueryConditionExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public final class SubqueryConditionExtractor implements OptionalSQLSegmentExtra 
        Collection<ParserRuleContext> suQueryNodes = ExtractorUtils.getAllDescendantNodes(ancestorNode, RuleName.SUBQUERY);

        SubqueryConditionSegment result = new SubqueryConditionSegment();

        for (ParserRuleContext each : suQueryNodes) {

            Optional<WhereSegment> condition = selectWhereExtractor.extract(each, ancestorNode);

            Optional<WhereSegment> condition = selectWhereExtractor.extract(each);

            if (condition.isPresent()) {

                result.getOrConditions().add(condition.get().getConditions());

            }