diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 5c20f3b14d..30e57ba6e6 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -136,6 +136,10 @@ public class SQLUtils { return toOdpsString(sqlObject, null); } + public static String toHiveString(SQLObject sqlObject) { + return toSQLString(sqlObject, DbType.odps); + } + public static String toOdpsString(SQLObject sqlObject, FormatOption option) { return toSQLString(sqlObject, DbType.odps, option); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java index fd4744aed3..5075a7d27a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java @@ -103,6 +103,8 @@ public class HiveCreateTableParser extends SQLCreateTableParser { } accept(Token.RPAREN); + } else if (lexer.token() == Token.LIKE) { + parseLike(stmt); } if (lexer.identifierEquals(FnvHash.Constants.ENGINE)) { @@ -274,19 +276,7 @@ public class HiveCreateTableParser extends SQLCreateTableParser { } if (lexer.token() == Token.LIKE) { - lexer.nextToken(); - - if (lexer.identifierEquals(FnvHash.Constants.MAPPING)) { - SQLExpr like = this.exprParser.primary(); - stmt.setLike(new SQLExprTableSource(like)); - } else if (lexer.token() == Token.SELECT || lexer.token() == Token.LPAREN) { - SQLSelect select = this.createSQLSelectParser().select(); - stmt.setLikeQuery(true); - stmt.setSelect(select); - } else { - SQLName name = this.exprParser.name(); - stmt.setLike(name); - } + parseLike(stmt); } if (lexer.identifierEquals(FnvHash.Constants.TBLPROPERTIES)) { @@ -366,6 +356,22 @@ public class HiveCreateTableParser extends SQLCreateTableParser { return stmt; } + protected void parseLike(HiveCreateTableStatement stmt) { + lexer.nextToken(); + + if (lexer.identifierEquals(FnvHash.Constants.MAPPING)) { + SQLExpr like = this.exprParser.primary(); + stmt.setLike(new SQLExprTableSource(like)); + } else if (lexer.token() == Token.SELECT || lexer.token() == Token.LPAREN) { + SQLSelect select = this.createSQLSelectParser().select(); + stmt.setLikeQuery(true); + stmt.setSelect(select); + } else { + SQLName name = this.exprParser.name(); + stmt.setLike(name); + } + } + private void parseSortedBy(HiveCreateTableStatement stmt) { lexer.nextToken(); accept(Token.BY); 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 1b8aea7ddf..17f1a99ebb 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 @@ -15,13 +15,10 @@ */ package com.alibaba.druid.bvt.sql.hive; +import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.hive.parser.HiveStatementParser; import com.alibaba.druid.sql.dialect.hive.visitor.HiveSchemaStatVisitor; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; -import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; @@ -39,6 +36,10 @@ public class HiveResourceTest extends TestCase { exec_test("bvt/parser/hive-0.txt"); } + public void test_1() throws Exception { + exec_test("bvt/parser/hive-1.txt"); + } + public void exec_test(String resource) throws Exception { // System.out.println(resource); InputStream is = null; @@ -71,13 +72,14 @@ public class HiveResourceTest extends TestCase { assertEquals(expect, stmt.toString()); } -// System.out.println(sql); + System.out.println(sql); +// System.out.println(stmt.toString()); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // // System.out.println(); // System.out.println("---------------------------"); -// System.out.println(SQLUtils.toOdpsString(stmt)); + System.out.println(SQLUtils.toHiveString(stmt)); } diff --git a/src/test/resources/bvt/parser/hive-1.txt b/src/test/resources/bvt/parser/hive-1.txt new file mode 100644 index 0000000000..3287a082a4 --- /dev/null +++ b/src/test/resources/bvt/parser/hive-1.txt @@ -0,0 +1,7 @@ +create table ads_data.sale_detail_one23 +like ads_data.sale_detail_one1 +STORED AS parquet +--------------------------- +CREATE TABLE ads_data.sale_detail_one23 +STORED AS parquet +LIKE ads_data.sale_detail_one1 \ No newline at end of file