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 5ba4a4e39d..3138bdffb7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1090,7 +1090,7 @@ public class SQLExprParser extends SQLParser { case LIKE: case UNION: case CREATE: - if (dbType == DbType.odps) { + if (dbType == DbType.odps || dbType == DbType.hive) { sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); lexer.nextToken(); break; 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 93fbea5aff..7c34606299 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -202,7 +202,8 @@ public class SQLParser { } case FOR: case GRANT: - if (dbType == DbType.odps){ + case CHECK: + if (dbType == DbType.odps || dbType == DbType.hive) { String strVal = lexer.stringVal(); lexer.nextToken(); return strVal; @@ -342,7 +343,7 @@ public class SQLParser { case SHOW: case SEQUENCE: case TO: - if (dbType == DbType.odps) { + if (dbType == DbType.odps || dbType == DbType.hive) { alias = lexer.stringVal(); lexer.nextToken(); break; @@ -351,7 +352,7 @@ public class SQLParser { case GROUP: case ORDER: case DEFAULT: - if (dbType == DbType.odps) { + if (dbType == DbType.odps || dbType == DbType.hive) { Lexer.SavePoint mark = lexer.mark(); alias = lexer.stringVal(); lexer.nextToken(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java index 88f0fb411f..ee6edeecb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java @@ -72,6 +72,10 @@ public class HiveResourceTest extends TestCase { exec_test("bvt/parser/hive-9.txt"); } + public void test_10() throws Exception { + exec_test("bvt/parser/hive-10.txt"); + } + public void exec_test(String resource) throws Exception { // System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/hive-10.txt b/src/test/resources/bvt/parser/hive-10.txt new file mode 100644 index 0000000000..8270aacfd4 --- /dev/null +++ b/src/test/resources/bvt/parser/hive-10.txt @@ -0,0 +1,5 @@ +select * from zhangkk_user check where check.user_id = 1; +--------------------------- +SELECT * +FROM zhangkk_user check +WHERE check.user_id = 1; \ No newline at end of file