This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 7135e7c114a Optimize BaseRule.g4 dataType support 'CHARACTER VARYING'.
(#25670)
7135e7c114a is described below
commit 7135e7c114aef3a034e8291497ffeccd4f5656ae
Author: Cong Hu <[email protected]>
AuthorDate: Mon May 15 18:57:00 2023 +0800
Optimize BaseRule.g4 dataType support 'CHARACTER VARYING'. (#25670)
* Optimize BaseRule.g4 dataType support 'CHARACTER VARYING'.
* Optimize BaseRule.g4 dataType support 'CHARACTER VARYING'.
* retrigger checks
* retrigger checks
---
.../dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4 | 2 +-
.../mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4 | 8 ++++++++
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, 23 insertions(+), 1 deletion(-)
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 b7490a2ba94..6290f98bed1 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
@@ -1161,7 +1161,7 @@ dataType
| (dataTypeName = NCHAR | dataTypeName = NATIONAL CHAR) fieldLength?
BINARY?
| dataTypeName = SIGNED (INTEGER | INT)?
| dataTypeName = BINARY fieldLength?
- | (dataTypeName = CHAR VARYING | dataTypeName = VARCHAR) fieldLength
charsetWithOptBinary?
+ | (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 = VARBINARY fieldLength?
| dataTypeName = YEAR fieldLength? fieldOptions?
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 3294d8ba836..a2773e2cb2a 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
@@ -243,10 +243,18 @@ CHAR
: C H A R
;
+CHAR_VARYING
+ : CHAR ' ' VARYING
+ ;
+
CHARACTER
: C H A R A C T E R
;
+CHARACTER_VARYING
+ : CHARACTER ' ' VARYING
+ ;
+
CHARSET
: C H A R S E T
;
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 2620d352496..1a353acd2aa 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
@@ -1794,4 +1794,17 @@
<column name="ATTACHMENT_NAME" />
</column-definition>
</create-table>
+
+ <create-table sql-case-id="create_table_with_character_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="CHARACTER VARYING" start-index="49"
stop-index="76">
+ <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 fe2b083f9bd..7c9b66511f7 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
@@ -128,4 +128,5 @@
<sql-case id="create_table_with_visible" value="CREATE TABLE t_order
(order_id INT, user_id INT, status VARCHAR(10) VISIBLE) ENGINE=INNODB"
db-types="MySQL" />
<sql-case id="create_table_with_invisible" value="CREATE TABLE t_order
(order_id INT, user_id INT, status VARCHAR(10) INVISIBLE) ENGINE=INNODB"
db-types="MySQL" />
<sql-case id="create_table_with_varchar2_char_and_byte_type" value="CREATE
TABLE t_order (SYS_ID VARCHAR2(32 CHAR) VISIBLE NOT NULL, ATTACHMENT_NAME
VARCHAR2(1024 BYTE) VISIBLE DEFAULT '')" db-types="Oracle" />
+ <sql-case id="create_table_with_character_varying" value="CREATE TABLE
t_order (order_id INT, user_id INT, status CHARACTER VARYING(50))"
db-types="MySQL" />
</sql-cases>
