From e71c2a6e93afe3e0824c7603e578e7ac37507477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Thu, 22 Oct 2020 18:46:56 +0800 Subject: [PATCH] fix build error & improve pg support --- .../parser/OracleCreateTableParser.java | 5 -- .../parser/PGCreateTableParser.java | 51 +++++++++++++++++++ .../parser/PGSQLStatementParser.java | 4 ++ .../sql/parser/SQLCreateTableParser.java | 2 +- .../druid/sql/parser/SQLStatementParser.java | 3 ++ .../resources/bvt/parser/postgresql-1.txt | 18 +++++++ 6 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java create mode 100644 src/test/resources/bvt/parser/postgresql-1.txt diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java index 2fa0d2d799..33da01460b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java @@ -636,9 +636,4 @@ public class OracleCreateTableParser extends SQLCreateTableParser { public OracleExprParser getExprParser() { return (OracleExprParser) exprParser; } - - - public SQLPartitionBy parsePartitionBy() { - return null; - } } 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 new file mode 100644 index 0000000000..ba9cd87927 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java @@ -0,0 +1,51 @@ +package com.alibaba.druid.sql.dialect.postgresql.parser; + +import com.alibaba.druid.sql.ast.SQLPartitionBy; +import com.alibaba.druid.sql.ast.SQLPartitionByList; +import com.alibaba.druid.sql.parser.*; + +public class PGCreateTableParser extends SQLCreateTableParser { + + public PGCreateTableParser(Lexer lexer){ + super(new PGExprParser(lexer)); + } + + public PGCreateTableParser(String sql){ + super(new PGExprParser(sql)); + } + + public PGCreateTableParser(SQLExprParser exprParser) { + super(exprParser); + } + + public SQLPartitionBy parsePartitionBy() { + lexer.nextToken(); + accept(Token.BY); + + if (lexer.identifierEquals("LIST")) { + lexer.nextToken(); + SQLPartitionByList list = new SQLPartitionByList(); + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + list.addColumn(this.exprParser.expr()); + accept(Token.RPAREN); + } else { + acceptIdentifier("COLUMNS"); + accept(Token.LPAREN); + for (; ; ) { + list.addColumn(this.exprParser.name()); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + accept(Token.RPAREN); + } + + return list; + } + throw new ParserException("TODO " + lexer.info()); + } +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java index 5a68608d69..81b3c3371c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java @@ -673,4 +673,8 @@ public class PGSQLStatementParser extends SQLStatementParser { return stmt; } + + public SQLCreateTableParser getSQLCreateTableParser() { + return new PGCreateTableParser(this.exprParser); + } } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java index 38ea407881..17b88115fb 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java @@ -184,7 +184,7 @@ public class SQLCreateTableParser extends SQLDDLParser { } public SQLPartitionBy parsePartitionBy() { - throw new ParserException("TODO " + lexer.info()); + return null; } protected SQLTableElement parseCreateTableSupplementalLogingProps() { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 7dac581c2c..129031ec54 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -3343,6 +3343,9 @@ public class SQLStatementParser extends SQLParser { } else if (lexer.identifierEquals(Constants.RESOURCE)) { lexer.reset(markBp, markChar, Token.CREATE); return parseCreateResourceGroup(); + } else if (lexer.token() == FOREIGN) { + lexer.reset(markBp, markChar, Token.CREATE); + return parseCreateTable(); } throw new ParserException("TODO " + lexer.info()); diff --git a/src/test/resources/bvt/parser/postgresql-1.txt b/src/test/resources/bvt/parser/postgresql-1.txt new file mode 100644 index 0000000000..eef226a94a --- /dev/null +++ b/src/test/resources/bvt/parser/postgresql-1.txt @@ -0,0 +1,18 @@ +CREATE TABLE IF NOT EXISTS test_dim_segment +( +aid bigint +,segment_id bigint +,segment_name text +,ds text not null +) +PARTITION BY LIST(ds); + +--------------------------- +SELECT e1.last_name +FROM employees e1 +WHERE f(CURSOR(( + SELECT e2.hire_date + FROM employees e2 + WHERE e1.employee_id = e2.manager_id + )), e1.hire_date) = 1 +ORDER BY last_name;