From a87e697a34a68f691b4ba09855195b890c1df97f Mon Sep 17 00:00:00 2001 From: terrymanu Date: Thu, 17 Aug 2017 13:33:13 +0800 Subject: [PATCH] refactor DropParser --- .../parsing/parser/dialect/mysql/MySQLDropParser.java | 4 ++-- .../parsing/parser/dialect/oracle/OracleDropParser.java | 2 +- .../parser/dialect/postgresql/PostgreSQLDropParser.java | 2 +- .../parser/dialect/sqlserver/SQLServerDropParser.java | 2 +- .../parser/statement/ddl/drop/AbstractDropParser.java | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLDropParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLDropParser.java index 1a22572163..d8ecf121dc 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLDropParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLDropParser.java @@ -34,12 +34,12 @@ public final class MySQLDropParser extends AbstractDropParser { } @Override - protected Keyword[] getSkipWordsBetweenDropAndTable() { + protected Keyword[] getSkipKeywordsBetweenDropAndTable() { return new Keyword[] {DefaultKeyword.TEMPORARY}; } @Override - protected Keyword[] getSkipWordsBetweenKeywordAndTableName() { + protected Keyword[] getSkipKeywordsBetweenDropTableAndTableName() { return new Keyword[] {DefaultKeyword.IF, DefaultKeyword.EXISTS}; } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleDropParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleDropParser.java index b810e6fe35..6d2a12ca3f 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleDropParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleDropParser.java @@ -33,7 +33,7 @@ public final class OracleDropParser extends AbstractDropParser { } @Override - protected Keyword[] getSkipWordsBetweenKeywordAndTableName() { + protected Keyword[] getSkipKeywordsBetweenDropTableAndTableName() { return new Keyword[] {}; } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/postgresql/PostgreSQLDropParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/postgresql/PostgreSQLDropParser.java index c3376d31ff..bf4c8827fc 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/postgresql/PostgreSQLDropParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/postgresql/PostgreSQLDropParser.java @@ -34,7 +34,7 @@ public final class PostgreSQLDropParser extends AbstractDropParser { } @Override - protected Keyword[] getSkipWordsBetweenKeywordAndTableName() { + protected Keyword[] getSkipKeywordsBetweenDropTableAndTableName() { return new Keyword[] {DefaultKeyword.IF, DefaultKeyword.EXISTS}; } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/sqlserver/SQLServerDropParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/sqlserver/SQLServerDropParser.java index c956c8f55d..1f95cb7d87 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/sqlserver/SQLServerDropParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/sqlserver/SQLServerDropParser.java @@ -34,7 +34,7 @@ public final class SQLServerDropParser extends AbstractDropParser { } @Override - protected Keyword[] getSkipWordsBetweenKeywordAndTableName() { + protected Keyword[] getSkipKeywordsBetweenDropTableAndTableName() { return new Keyword[] {DefaultKeyword.IF, DefaultKeyword.EXISTS}; } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/ddl/drop/AbstractDropParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/ddl/drop/AbstractDropParser.java index 5c1739120a..6138c2240e 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/ddl/drop/AbstractDropParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/ddl/drop/AbstractDropParser.java @@ -48,18 +48,18 @@ public abstract class AbstractDropParser implements SQLStatementParser { @Override public DDLStatement parse() { sqlParser.getLexer().nextToken(); - getSqlParser().skipAll(getSkipWordsBetweenDropAndTable()); + getSqlParser().skipAll(getSkipKeywordsBetweenDropAndTable()); if (!sqlParser.skipIfEqual(DefaultKeyword.TABLE)) { throw new SQLParsingUnsupportedException(sqlParser.getLexer().getCurrentToken().getType()); } - getSqlParser().skipAll(getSkipWordsBetweenKeywordAndTableName()); + getSqlParser().skipAll(getSkipKeywordsBetweenDropTableAndTableName()); sqlParser.parseSingleTable(dropStatement); return dropStatement; } - protected Keyword[] getSkipWordsBetweenDropAndTable() { + protected Keyword[] getSkipKeywordsBetweenDropAndTable() { return new Keyword[0]; } - protected abstract Keyword[] getSkipWordsBetweenKeywordAndTableName(); + protected abstract Keyword[] getSkipKeywordsBetweenDropTableAndTableName(); } -- GitLab