From 5e5932e394820032fb4e5a5eb5b8a12cb7f988b6 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Wed, 9 Aug 2017 19:33:10 +0800 Subject: [PATCH] refactor select parser --- .../parsing/parser/dialect/mysql/MySQLSelectParser.java | 3 +-- .../parsing/parser/dialect/oracle/OracleSelectParser.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLSelectParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLSelectParser.java index 4d1eec1b9a..4eb08a17dd 100755 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLSelectParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLSelectParser.java @@ -40,8 +40,7 @@ public class MySQLSelectParser extends AbstractSelectParser { @Override public void query() { - if (getSqlParser().equalAny(DefaultKeyword.SELECT)) { - getSqlParser().getLexer().nextToken(); + if (getSqlParser().skipIfEqual(DefaultKeyword.SELECT)) { parseDistinct(); getSqlParser().skipAll(MySQLKeyword.HIGH_PRIORITY, DefaultKeyword.STRAIGHT_JOIN, MySQLKeyword.SQL_SMALL_RESULT, MySQLKeyword.SQL_BIG_RESULT, MySQLKeyword.SQL_BUFFER_RESULT, MySQLKeyword.SQL_CACHE, MySQLKeyword.SQL_NO_CACHE, MySQLKeyword.SQL_CALC_FOUND_ROWS); diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleSelectParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleSelectParser.java index f2212046ba..052aec4e08 100755 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleSelectParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleSelectParser.java @@ -34,8 +34,7 @@ public class OracleSelectParser extends AbstractSelectParser { @Override public void query() { - if (getSqlParser().equalAny(DefaultKeyword.SELECT)) { - getSqlParser().getLexer().nextToken(); + if (getSqlParser().skipIfEqual(DefaultKeyword.SELECT)) { parseDistinct(); parseSelectList(); } -- GitLab