diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java index ba9cd87927..6f60e7daba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java @@ -1,6 +1,7 @@ package com.alibaba.druid.sql.dialect.postgresql.parser; import com.alibaba.druid.sql.ast.SQLPartitionBy; +import com.alibaba.druid.sql.ast.SQLPartitionByHash; import com.alibaba.druid.sql.ast.SQLPartitionByList; import com.alibaba.druid.sql.parser.*; @@ -45,7 +46,26 @@ public class PGCreateTableParser extends SQLCreateTableParser { } return list; + } else if (lexer.identifierEquals("HASH") || lexer.identifierEquals("UNI_HASH")) { + SQLPartitionByHash hash = new SQLPartitionByHash(); + + if (lexer.identifierEquals("UNI_HASH")) { + hash.setUnique(true); + } + + lexer.nextToken(); + + if (lexer.token() == Token.KEY) { + lexer.nextToken(); + hash.setKey(true); + } + + accept(Token.LPAREN); + this.exprParser.exprList(hash.getColumns(), hash); + accept(Token.RPAREN); + return hash; } + throw new ParserException("TODO " + lexer.info()); } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 914a281097..325f7e9b34 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -3512,6 +3512,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet public boolean visit(SQLCreateTableStatement x) { printCreateTable(x, true); + SQLPartitionBy partitionBy = x.getPartitioning(); + if (partitionBy != null) { + println(); + print0(ucase ? "PARTITION BY " : "partition by "); + partitionBy.accept(this); + } + List options = x.getTableOptions(); if (options.size() > 0) { println(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java index 74c79c33b6..996f6cef1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java @@ -64,6 +64,10 @@ public class PostgresqlResourceTest extends PGTest { exec_test("bvt/parser/postgresql-6.txt"); } + public void test_7() throws Exception { + exec_test("bvt/parser/postgresql-7.txt"); + } + public void exec_test(String resource) throws Exception { System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/postgresql-1.txt b/src/test/resources/bvt/parser/postgresql-1.txt index 10df177494..89d97143e8 100644 --- a/src/test/resources/bvt/parser/postgresql-1.txt +++ b/src/test/resources/bvt/parser/postgresql-1.txt @@ -13,4 +13,5 @@ CREATE TABLE IF NOT EXISTS test_dim_segment ( segment_id bigint, segment_name text, ds text NOT NULL -); +) +PARTITION BY LIST (ds); diff --git a/src/test/resources/bvt/parser/postgresql-7.txt b/src/test/resources/bvt/parser/postgresql-7.txt new file mode 100644 index 0000000000..e4b3a408f9 --- /dev/null +++ b/src/test/resources/bvt/parser/postgresql-7.txt @@ -0,0 +1,12 @@ +CREATE TABLE orders ( + order_id bigint not null, + cust_id bigint not null, + status text +) PARTITION BY HASH (order_id); +--------------------------- +CREATE TABLE orders ( + order_id bigint NOT NULL, + cust_id bigint NOT NULL, + status text +) +PARTITION BY HASH (order_id); \ No newline at end of file