From d7eed640d1811c79cb9724d69c279c753062e88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sun, 5 Sep 2021 22:25:05 +0800 Subject: [PATCH] improved odps support --- .../java/com/alibaba/druid/sql/parser/Lexer.java | 4 ++++ .../alibaba/druid/sql/parser/SQLExprParser.java | 15 ++++++++++++--- .../com/alibaba/druid/sql/parser/SQLParser.java | 1 + .../com/alibaba/druid/sql/parser/SQLType.java | 2 ++ .../druid/bvt/sql/odps/ScanSQLTypeV2Test.java | 9 +++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 235ebe36fe..0d3db0c092 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -779,6 +779,8 @@ public class Lexer { return SQLType.SHOW_FUNCTIONS; } else if (identifierEquals(FnvHash.Constants.ROLES)) { return SQLType.SHOW_ROLES; + } else if (identifierEquals(FnvHash.Constants.ROLE)) { + return SQLType.SHOW_ROLE; } else if (identifierEquals(FnvHash.Constants.LABEL)) { return SQLType.SHOW_LABEL; } else if (identifierEquals(FnvHash.Constants.GRANTS)) { @@ -836,6 +838,8 @@ public class Lexer { return SQLType.LIST_TABLES; } else if (identifierEquals(FnvHash.Constants.ROLES)) { return SQLType.LIST_ROLES; + } else if (identifierEquals(FnvHash.Constants.TEMPORARY)) { + return SQLType.LIST_TEMPORARY_OUTPUT; } else if (identifierEquals("TENANT")) { nextToken(); if (identifierEquals(FnvHash.Constants.ROLES)) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index bbcfeabe52..97bdbee9bb 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -3806,11 +3806,20 @@ public class SQLExprParser extends SQLParser { return expr; } break; - case RLIKE: + case RLIKE: { + Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - rightExp = bitOr(); - expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.RLike, rightExp, getDbType()); + switch (lexer.token) { + case COMMA: + lexer.reset(mark); + break; + default: + rightExp = bitOr(); + expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.RLike, rightExp, getDbType()); + break; + } break; + } case IDENTIFIER: long hash = lexer.hash_lower; if (hash == FnvHash.Constants.SOUNDS) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java index 4faa9f6231..67520a41f7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -550,6 +550,7 @@ public class SQLParser { case TO: case REFERENCES: case LIKE: + case RLIKE: case NULL: case RIGHT: case LEFT: diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLType.java b/src/main/java/com/alibaba/druid/sql/parser/SQLType.java index 0e54316c70..c664af6f5a 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLType.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLType.java @@ -32,6 +32,7 @@ public enum SQLType { SHOW_PARTITIONS, SHOW_CATALOGS, SHOW_FUNCTIONS, + SHOW_ROLE, SHOW_ROLES, SHOW_PACKAGE, SHOW_PACKAGES, @@ -58,6 +59,7 @@ public enum SQLType { LIST_TENANT_ROLES, LIST_TRUSTEDPROJECTS, LIST_ACCOUNTPROVIDERS, + LIST_TEMPORARY_OUTPUT, WHO, // for analyticdb GRANT, REVOKE, diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/ScanSQLTypeV2Test.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/ScanSQLTypeV2Test.java index d623d9da15..e1003bf01e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/ScanSQLTypeV2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/ScanSQLTypeV2Test.java @@ -367,6 +367,15 @@ public class ScanSQLTypeV2Test extends TestCase { assertEquals(SQLType.REMOVE, sqlType); } + public void test_sqlTypeV2_42() throws Exception { + String sql = "show role grant \n" + + "bsj65s8s6ahf@aliyun.com;"; + + Lexer lexer = SQLParserUtils.createLexer(sql, DbType.odps); + SQLType sqlType = lexer.scanSQLTypeV2(); + assertEquals(SQLType.SHOW_ROLE, sqlType); + } + public void test_sqlTypeV2_udf_01() throws Exception { String sql = "ALTER TABLE DWS_ITEM_APPLY2DELIV_LIST_DF\n" + "\tCHANGE COLUMN DELIVERY_PDOTYPE RENAME TO DELIVERY_ORDER_TYPE;";