From 1fa599c340e0ee3675904c1dd9ae14552c869b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Thu, 26 Nov 2020 18:01:15 +0800 Subject: [PATCH] improved oracle ddl support --- .../oracle/parser/OracleExprParser.java | 38 ++++++++- .../create/OracleCreatePackageTest3.java | 2 + .../oracle/visitor/OracleResourceTest.java | 4 + src/test/resources/bvt/parser/oracle-58.txt | 80 +++++++++++++++++++ 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/bvt/parser/oracle-58.txt diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index dddfe1af67..7593fb0a4e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -34,6 +34,7 @@ import com.alibaba.druid.util.FnvHash; import java.math.BigInteger; import java.util.Arrays; +import java.util.List; public class OracleExprParser extends SQLExprParser { @@ -121,6 +122,7 @@ public class OracleExprParser extends SQLExprParser { protected boolean isCharType(long hash) { return hash == FnvHash.Constants.CHAR + || hash == FnvHash.Constants.CHARACTER || hash == FnvHash.Constants.NCHAR || hash == FnvHash.Constants.VARCHAR || hash == FnvHash.Constants.VARCHAR2 @@ -221,8 +223,43 @@ public class OracleExprParser extends SQLExprParser { return timestamp; } + + if ("national".equalsIgnoreCase(typeName) + && isCharType(lexer.hash_lower())) { + typeName += ' ' + lexer.stringVal(); + lexer.nextToken(); + + if (lexer.identifierEquals("VARYING")) { + typeName += ' ' + lexer.stringVal(); + lexer.nextToken(); + } + + SQLCharacterDataType charType = new SQLCharacterDataType(typeName); + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + SQLExpr arg = this.expr(); + arg.setParent(charType); + charType.addArgument(arg); + accept(Token.RPAREN); + } + + charType = (SQLCharacterDataType) parseCharTypeRest(charType); + + if (lexer.token() == Token.HINT) { + List hints = this.parseHints(); + charType.setHints(hints); + } + + return charType; + } if (isCharType(typeName)) { + if (lexer.identifierEquals("VARYING")) { + typeName += ' ' + lexer.stringVal(); + lexer.nextToken(); + } + SQLCharacterDataType charType = new SQLCharacterDataType(typeName); if (lexer.token() == Token.LPAREN) { @@ -261,7 +298,6 @@ public class OracleExprParser extends SQLExprParser { } } - SQLDataTypeImpl dataType = new SQLDataTypeImpl(typeName); dataType.setDbType(dbType); return parseDataTypeRest(dataType); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java index 36021bd837..30a052ca60 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java @@ -71,6 +71,8 @@ public class OracleCreatePackageTest3 extends OracleTest { " RETURN VARCHAR2;\n" + "END Mail_fck_bpi;"; + System.out.println(sql); + OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java index 7913de1849..790f34c79f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java @@ -41,6 +41,10 @@ public class OracleResourceTest extends OracleTest { } } + public void test_58() throws Exception { + exec_test("bvt/parser/oracle-58.txt"); + } + public void exec_test(String resource) throws Exception { System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/oracle-58.txt b/src/test/resources/bvt/parser/oracle-58.txt new file mode 100644 index 0000000000..44559cea82 --- /dev/null +++ b/src/test/resources/bvt/parser/oracle-58.txt @@ -0,0 +1,80 @@ +CREATE TABLE "TEST"."ORACLE_ALL_TYPES_A" +( + c_char CHAR, + c_char_n CHAR(12), + c_char_nb CHAR(12 BYTE), + c_char_nc CHAR(12 CHAR), + c_character CHARACTER(10), + c_character_b CHARACTER(10 BYTE), + c_character_c CHARACTER(10 CHAR), + + c_nchar NCHAR, + c_nchar_n NCHAR(12), + c_national_character NATIONAL CHARACTER(12), + c_national_char NATIONAL CHAR(12), + + c_varchar2 VARCHAR2(24), + c_varchar2_b VARCHAR2(24 BYTE), + c_varchar2_c VARCHAR2(24 CHAR), + c_character_varying CHARACTER VARYING(24), + c_character_varying_b CHARACTER VARYING(24 BYTE), + c_character_varying_c CHARACTER VARYING(24 CHAR), + c_char_varying CHAR VARYING(24), + c_char_varying_b CHAR VARYING(24 BYTE), + c_char_varying_c CHAR VARYING(24 CHAR), + c_national_char_varying NATIONAL CHAR VARYING(24), + + c_nvarchar2 NVARCHAR2(24), + c_national_character_varying NATIONAL CHARACTER VARYING(24), + c_nchar_varying NCHAR VARYING(24), + + c_clob CLOB, + c_nclob NCLOB, + + c_number NUMBER, + c_number_n NUMBER(10), + c_number_n_n NUMBER(10, 2), + c_numeric NUMERIC, + c_numeric_n NUMERIC(10), + c_numeric_n_n NUMERIC(10, 2), + c_decimal DECIMAL, + c_decimal_n DECIMAL(10), + c_decimal_n_n DECIMAL(10, 2), + + c_float FLOAT, + c_float_n FLOAT(10), + c_integer INTEGER, + c_int INT, + c_smallint SMALLINT, + c_double_p DOUBLE PRECISION, + c_real REAL, + + c_bfloat BINARY_FLOAT, + c_bdouble BINARY_DOUBLE, + + c_date DATE, + + c_timestamp TIMESTAMP, + c_timestamp_n TIMESTAMP(9), + c_timestamp_z TIMESTAMP WITH TIME ZONE, + c_timestamp_n_z TIMESTAMP(9) WITH TIME ZONE, + c_timestamp_lz TIMESTAMP WITH LOCAL TIME ZONE, + c_timestamp_n_lz TIMESTAMP(9) WITH LOCAL TIME ZONE, + + c_interval_year INTERVAL YEAR TO MONTH, + c_interval_year_n INTERVAL YEAR (9) TO MONTH, + c_interval_day INTERVAL DAY TO SECOND, + c_interval_day_n1 INTERVAL DAY (9) TO SECOND, + c_interval_day_n2 INTERVAL DAY TO SECOND (9), + c_interval_day_n1n2 INTERVAL DAY (9) TO SECOND (9), + + c_raw RAW(10), + c_long_raw LONG RAW, + c_blob BLOB, + c_bfile BFILE, + -- c_long LONG, + + c_rowid ROWID, + c_urowid UROWID +) +---------------------------