This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 81189410074 Optimize BaseRule.g4 dataType support 'LONG CHAR VARYING'.
(#25710)
81189410074 is described below
commit 81189410074e6f9777acdea9ab32668c1997dae6
Author: Cong Hu <[email protected]>
AuthorDate: Wed May 17 13:36:57 2023 +0800
Optimize BaseRule.g4 dataType support 'LONG CHAR VARYING'. (#25710)
* Optimize BaseRule.g4 dataType support 'LONG CHAR VARYING'.
* Update create-table.xml
---
.../dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4 | 4 ++--
.../mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4 | 12 ++++++++++++
test/it/parser/src/main/resources/case/ddl/create-table.xml | 13 +++++++++++++
.../src/main/resources/sql/supported/ddl/create-table.xml | 1 +
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index 709d2d9882f..05405493d8e 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -1162,7 +1162,7 @@ dataType
| dataTypeName = SIGNED (INTEGER | INT)?
| dataTypeName = BINARY fieldLength?
| (dataTypeName = CHAR_VARYING | dataTypeName = CHARACTER_VARYING |
dataTypeName = VARCHAR) fieldLength charsetWithOptBinary?
- | (dataTypeName = NATIONAL VARCHAR | dataTypeName = NVARCHAR |
dataTypeName = NCHAR VARCHAR | dataTypeName = NATIONAL_CHAR VARYING |
dataTypeName = NCHAR VARYING) fieldLength BINARY?
+ | (dataTypeName = NATIONAL VARCHAR | dataTypeName = NVARCHAR |
dataTypeName = NCHAR VARCHAR | dataTypeName = NATIONAL_CHAR_VARYING |
dataTypeName = NCHAR VARYING) fieldLength BINARY?
| dataTypeName = VARBINARY fieldLength?
| dataTypeName = YEAR fieldLength? fieldOptions?
| dataTypeName = DATE
@@ -1174,7 +1174,7 @@ dataType
| dataTypeName = BLOB fieldLength?
| dataTypeName = (MEDIUMBLOB | LONGBLOB)
| dataTypeName = LONG VARBINARY
- | dataTypeName = LONG (CHAR VARYING | VARCHAR)? charsetWithOptBinary?
+ | dataTypeName = (LONG_CHAR_VARYING | LONG_VARCHAR)? charsetWithOptBinary?
| dataTypeName = TINYTEXT charsetWithOptBinary?
| dataTypeName = TEXT fieldLength? charsetWithOptBinary?
| dataTypeName = MEDIUMTEXT charsetWithOptBinary?
diff --git
a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4
b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4
index 20cd04fc202..40dcc53bb58 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4
@@ -1271,6 +1271,14 @@ LONGTEXT
: L O N G T E X T
;
+LONG_CHAR_VARYING
+ : LONG ' ' CHAR ' ' VARYING
+ ;
+
+LONG_VARCHAR
+ : LONG ' ' VARCHAR
+ ;
+
LOOP
: L O O P
;
@@ -1539,6 +1547,10 @@ NATIONAL_CHAR
: NATIONAL ' ' CHAR
;
+NATIONAL_CHAR_VARYING
+ : NATIONAL ' ' CHAR_VARYING
+ ;
+
NATURAL
: N A T U R A L
;
diff --git a/test/it/parser/src/main/resources/case/ddl/create-table.xml
b/test/it/parser/src/main/resources/case/ddl/create-table.xml
index 66fe7a18a21..1a03dece624 100644
--- a/test/it/parser/src/main/resources/case/ddl/create-table.xml
+++ b/test/it/parser/src/main/resources/case/ddl/create-table.xml
@@ -1829,4 +1829,17 @@
</column-definition>
<constraint-definition index-name="mv_idx" start-index="24"
stop-index="64" />
</create-table>
+
+ <create-table sql-case-id="create_table_with_long_char_varying">
+ <table name="t_order" start-index="13" stop-index="19" />
+ <column-definition type="INT" start-index="22" stop-index="33">
+ <column name="order_id" />
+ </column-definition>
+ <column-definition type="INT" start-index="36" stop-index="46">
+ <column name="user_id" />
+ </column-definition>
+ <column-definition type="LONG CHAR VARYING" start-index="49"
stop-index="72">
+ <column name="status" />
+ </column-definition>
+ </create-table>
</sql-parser-test-cases>
diff --git
a/test/it/parser/src/main/resources/sql/supported/ddl/create-table.xml
b/test/it/parser/src/main/resources/sql/supported/ddl/create-table.xml
index df4ea7d94a1..e233c189345 100644
--- a/test/it/parser/src/main/resources/sql/supported/ddl/create-table.xml
+++ b/test/it/parser/src/main/resources/sql/supported/ddl/create-table.xml
@@ -132,4 +132,5 @@
<sql-case id="create_table_with_geomcollection" value="CREATE TABLE t1 (g
GEOMCOLLECTION)" db-types="MySQL" />
<sql-case id="create_table_with_start_transaction" value="CREATE TABLE
t_order (order_id INT) START TRANSACTION" db-types="MySQL" />
<sql-case id="create_table_with_cast_function" value="CREATE TABLE t1(j
json, INDEX mv_idx((CAST(j AS UNSIGNED ARRAY))))" db-types="MySQL" />
+ <sql-case id="create_table_with_long_char_varying" value="CREATE TABLE
t_order (order_id INT, user_id INT, status LONG CHAR VARYING)" db-types="MySQL"
/>
</sql-cases>
