Skip to content

Commit 7d71db7

Browse files
authored
Update create database option name for opengauss sql parser (#37350)
1 parent f956005 commit 7d71db7

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

parser/sql/engine/dialect/opengauss/src/main/antlr4/imports/opengauss/BaseRule.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ uescape
126126

127127
unreservedWord
128128
: SELECT | INSERT | UPDATE | DELETE | CREATE | ALTER | DROP | TRUNCATE | SCHEMA | GRANT | REVOKE | ADD | SET | TABLE | COLUMN | INDEX | CONSTRAINT | PRIMARY | UNIQUE | FOREIGN | KEY | POSITION | PRECISION | FUNCTION | TRIGGER | PROCEDURE | VIEW | INTO | VALUES | WITH | UNION | DISTINCT | MAXSIZE | CASE | WHEN | CAST | TRIM | SUBSTRING | FROM | NATURAL | JOIN | FULL | INNER | OUTER | LEFT | RIGHT | CROSS | USING | WHERE | AS | ON | IF | ELSE | THEN | FOR | TO | AND | OR | IS | NOT | NULL | TRUE | FALSE | EXISTS | BETWEEN | IN | ALL | ANY | LIKE | ORDER | GROUP | BY | ASC | DESC | HAVING | LIMIT | OFFSET | BEGIN | COMMIT | ROLLBACK | SAVEPOINT | BOOLEAN | DOUBLE | CHAR | CHARACTER | ARRAY | INTERVAL | DATE | TIME | TIMESTAMP | LOCALTIME | LOCALTIMESTAMP | YEAR | QUARTER | MONTH | WEEK | DAY | HOUR | MINUTE | SECOND | MICROSECOND | DEFAULT | CURRENT | ENABLE | DISABLE | CALL | INSTANCE | PRESERVE | DO | DEFINER | CURRENT_USER | SQL | CASCADED | LOCAL | CLOSE | OPEN | NEXT | NAME | COLLATION | NAMES | INTEGER | REAL | DECIMAL | TYPE | SMALLINT | BIGINT | NUMERIC | TEXT | REPEATABLE | CURRENT_DATE | CURRENT_TIME | CURRENT_TIMESTAMP | NULLIF | VARYING | NATIONAL | NCHAR | VALUE | BOTH | LEADING | TRAILING | COALESCE | INTERSECT | EXCEPT | PACKAGE | MINUS | TIES | FETCH | CUBE | GROUPING | SETS | WINDOW | OTHERS | OVERLAPS | SOME | AT | DEC | END | LESS | THAN | MAXVALUE | SEPARATOR
129-
| ADMIN | BINARY | ESCAPE | EXISTS | EXCLUDE | MOD | PARTITION | ROW | UNKNOWN | ALWAYS | CASCADE | CHECK | GENERATED | ISOLATION | LEVEL | NO | OPTION | PRIVILEGES | READ | REFERENCES | ROLE | ROWS | START | TRANSACTION | USER | ACTION | CACHE | CHARACTERISTICS | CLUSTER | COLLATE | COMMENTS | CONCURRENTLY | CONNECT | CONSTRAINTS | CURRENT_TIMESTAMP | CYCLE | DATA | DATABASE | DEFAULTS | DEFERRABLE | DEFERRED | DEPENDS | DOMAIN | EXCLUDING | EXECUTE | EXTENDED | EXTENSION | EXTERNAL | EXTRACT | FILTER | FIRST | FOLLOWING | FORCE | GLOBAL | IDENTITY | IMMEDIATE | INCLUDING | INCREMENT | INDEXES | INHERIT | INHERITS | INITIALLY | INCLUDE | LANGUAGE | LARGE | LAST | LOGGED | MAIN | MATCH | MAXVALUE | MINVALUE | NOTHING | NULLS | OBJECT | OIDS | ONLY | OVER | OWNED | OWNER | PARTIAL | PLAIN | PRECEDING | RANGE | RENAME | REPLICA | RESET | RESTART | RESTRICT | ROUTINE | SYNONYM | RULE | SECURITY | SEQUENCE | SESSION | SESSION_USER | SHOW | SIMPLE | STATISTICS | STORAGE | TABLESPACE | TEMP | TEMPORARY | UNBOUNDED | UNLOGGED | USAGE | VALID | VALIDATE | WITHIN | WITHOUT | ZONE | OF | UESCAPE | GROUPS | RECURSIVE | INT | INT2 | INT4 | INT8 | FLOAT | FLOAT4 | FLOAT8 | SMALLSERIAL | SERIAL | BIGSERIAL | VARCHAR | BYTEA | ENUM | POINT | LINE | LSEG | BOX | PATH | POLYGON | CIRCLE | CIDR | INET | MACADDR | MACADDR8 | BIT | VARBIT | TSVECTOR | TSQUERY | XML | JSON | INT4RANGE | INT8RANGE | NUMRANGE | TSRANGE | TSTZRANGE | DATERANGE | TABLESAMPLE | ORDINALITY | CURRENT_ROLE | CURRENT_CATALOG | CURRENT_SCHEMA | NORMALIZE | OVERLAY | XMLCONCAT | XMLELEMENT | XMLEXISTS | XMLFOREST | XMLPARSE | XMLPI | XMLROOT | XMLSERIALIZE | TREAT | SETOF | NFC | NFD | NFKC | NFKD | XMLATTRIBUTES | REF | PASSING | VERSION | YES | STANDALONE | GREATEST | LEAST | MATERIALIZED | OPERATOR | SHARE | ROLLUP | ILIKE | SIMILAR | ISNULL | NOTNULL | SYMMETRIC | DOCUMENT | NORMALIZED | ASYMMETRIC | VARIADIC | NOWAIT | LOCKED | XMLTABLE | COLUMNS | CONTENT | STRIP | WHITESPACE | XMLNAMESPACES | PLACING | RETURNING | LATERAL | NONE | ANALYSE | ANALYZE | CONFLICT | OVERRIDING | SYSTEM | ABORT | ABSOLUTE | ACCESS | AFTER | AGGREGATE | ALSO | ATTACH | ATTRIBUTE | BACKWARD | BEFORE | ASSERTION | ASSIGNMENT | CONTINUE | CONVERSION | COPY | COST | CSV | CALLED | CATALOG | CHAIN | CHECKPOINT | CLASS | CONFIGURATION | COMMENT | DETACH | DICTIONARY | DIRECTORY | EXPRESSION | INSENSITIVE | DISCARD | OFF | INSTEAD | EXPLAIN | INPUT | INLINE | PARALLEL | LEAKPROOF | COMMITTED | ENCODING | IMPLICIT | DELIMITER | CURSOR | EACH | EVENT | DEALLOCATE | CONNECTION | DECLARE | FAMILY | FORWARD | EXCLUSIVE | FUNCTIONS | LOCATION | LABEL | DELIMITERS | HANDLER | HEADER | IMMUTABLE | GRANTED | HOLD | MAPPING | OLD | METHOD | LOAD | LISTEN | MODE | MOVE | PROCEDURAL | PARSER | PROCEDURES | ENCRYPTED | PUBLICATION | PROGRAM | REFERENCING | PLANS | REINDEX | PRIOR | PASSWORD | RELATIVE | QUOTE | ROUTINES | REPLACE | SNAPSHOT | REFRESH | PREPARE | OPTIONS | IMPORT | INVOKER | NEW | PREPARED | SCROLL | SEQUENCES | SYSID | REASSIGN | SERVER | SUBSCRIPTION | SEARCH | SCHEMAS | RECHECK | POLICY | NOTIFY | LOCK | RELEASE | SERIALIZABLE | RETURNS | STATEMENT | STDIN | STDOUT | TABLES | SUPPORT | STABLE | TEMPLATE | UNENCRYPTED | VIEWS | UNCOMMITTED | TRANSFORM | UNLISTEN | TRUSTED | VALIDATOR | UNTIL | VACUUM | VOLATILE | STORED | WRITE | STRICT | TYPES | WRAPPER | WORK | FREEZE | AUTHORIZATION | VERBOSE | PERFORMANCE | PARAM | OUT | INOUT | DUPLICATE | PREDICT | FEATURES | TS_REWRITE | INT16 | INT1 | ELEM_CONTAINED_BY_RANGE | LOWER_INF | UPPER_INF | ABBREV | SET_MASKLEN | TRUNC | CLIENT_MASTER_KEY | COLUMN_ENCRYPTION_KEY
129+
| ADMIN | BINARY | ESCAPE | EXISTS | EXCLUDE | MOD | PARTITION | ROW | UNKNOWN | ALWAYS | CASCADE | CHECK | GENERATED | ISOLATION | LEVEL | NO | OPTION | PRIVILEGES | READ | REFERENCES | ROLE | ROWS | START | TRANSACTION | USER | ACTION | CACHE | CHARACTERISTICS | CLUSTER | COLLATE | COMMENTS | CONCURRENTLY | CONNECT | CONSTRAINTS | CURRENT_TIMESTAMP | CYCLE | DATA | DATABASE | DEFAULTS | DEFERRABLE | DEFERRED | DEPENDS | DOMAIN | EXCLUDING | EXECUTE | EXTENDED | EXTENSION | EXTERNAL | EXTRACT | FILTER | FIRST | FOLLOWING | FORCE | GLOBAL | IDENTITY | IMMEDIATE | INCLUDING | INCREMENT | INDEXES | INHERIT | INHERITS | INITIALLY | INCLUDE | LANGUAGE | LARGE | LAST | LOGGED | MAIN | MATCH | MAXVALUE | MINVALUE | NOTHING | NULLS | OBJECT | OIDS | ONLY | OVER | OWNED | OWNER | PARTIAL | PLAIN | PRECEDING | RANGE | RENAME | REPLICA | RESET | RESTART | RESTRICT | ROUTINE | SYNONYM | RULE | SECURITY | SEQUENCE | SESSION | SESSION_USER | SHOW | SIMPLE | STATISTICS | STORAGE | TABLESPACE | TEMP | TEMPORARY | UNBOUNDED | UNLOGGED | USAGE | VALID | VALIDATE | WITHIN | WITHOUT | ZONE | OF | UESCAPE | GROUPS | RECURSIVE | INT | INT2 | INT4 | INT8 | FLOAT | FLOAT4 | FLOAT8 | SMALLSERIAL | SERIAL | BIGSERIAL | VARCHAR | BYTEA | ENUM | POINT | LINE | LSEG | BOX | PATH | POLYGON | CIRCLE | CIDR | INET | MACADDR | MACADDR8 | BIT | VARBIT | TSVECTOR | TSQUERY | XML | JSON | INT4RANGE | INT8RANGE | NUMRANGE | TSRANGE | TSTZRANGE | DATERANGE | TABLESAMPLE | ORDINALITY | CURRENT_ROLE | CURRENT_CATALOG | CURRENT_SCHEMA | NORMALIZE | OVERLAY | XMLCONCAT | XMLELEMENT | XMLEXISTS | XMLFOREST | XMLPARSE | XMLPI | XMLROOT | XMLSERIALIZE | TREAT | SETOF | NFC | NFD | NFKC | NFKD | XMLATTRIBUTES | REF | PASSING | VERSION | YES | STANDALONE | GREATEST | LEAST | MATERIALIZED | OPERATOR | SHARE | ROLLUP | ILIKE | SIMILAR | ISNULL | NOTNULL | SYMMETRIC | DOCUMENT | NORMALIZED | ASYMMETRIC | VARIADIC | NOWAIT | LOCKED | XMLTABLE | COLUMNS | CONTENT | STRIP | WHITESPACE | XMLNAMESPACES | PLACING | RETURNING | LATERAL | NONE | ANALYSE | ANALYZE | CONFLICT | OVERRIDING | SYSTEM | ABORT | ABSOLUTE | ACCESS | AFTER | AGGREGATE | ALSO | ATTACH | ATTRIBUTE | BACKWARD | BEFORE | ASSERTION | ASSIGNMENT | CONTINUE | CONVERSION | COPY | COST | CSV | CALLED | CATALOG | CHAIN | CHECKPOINT | CLASS | CONFIGURATION | COMMENT | DETACH | DICTIONARY | DIRECTORY | EXPRESSION | INSENSITIVE | DISCARD | OFF | INSTEAD | EXPLAIN | INPUT | INLINE | PARALLEL | LEAKPROOF | COMMITTED | ENCODING | IMPLICIT | DELIMITER | CURSOR | EACH | EVENT | DEALLOCATE | CONNECTION | DECLARE | FAMILY | FORWARD | EXCLUSIVE | FUNCTIONS | LOCATION | LABEL | DELIMITERS | HANDLER | HEADER | IMMUTABLE | GRANTED | HOLD | MAPPING | OLD | METHOD | LOAD | LISTEN | MODE | MOVE | PROCEDURAL | PARSER | PROCEDURES | ENCRYPTED | PUBLICATION | PROGRAM | REFERENCING | PLANS | REINDEX | PRIOR | PASSWORD | RELATIVE | QUOTE | ROUTINES | REPLACE | SNAPSHOT | REFRESH | PREPARE | OPTIONS | IMPORT | INVOKER | NEW | PREPARED | SCROLL | SEQUENCES | SYSID | REASSIGN | SERVER | SUBSCRIPTION | SEARCH | SCHEMAS | RECHECK | POLICY | NOTIFY | LOCK | RELEASE | SERIALIZABLE | RETURNS | STATEMENT | STDIN | STDOUT | TABLES | SUPPORT | STABLE | TEMPLATE | UNENCRYPTED | VIEWS | UNCOMMITTED | TRANSFORM | UNLISTEN | TRUSTED | VALIDATOR | UNTIL | VACUUM | VOLATILE | STORED | WRITE | STRICT | TYPES | WRAPPER | WORK | FREEZE | AUTHORIZATION | VERBOSE | PERFORMANCE | PARAM | OUT | INOUT | DUPLICATE | PREDICT | FEATURES | TS_REWRITE | INT16 | INT1 | ELEM_CONTAINED_BY_RANGE | LOWER_INF | UPPER_INF | ABBREV | SET_MASKLEN | TRUNC | CLIENT_MASTER_KEY | COLUMN_ENCRYPTION_KEY | DBCOMPATIBILITY | LC_COLLATE | LC_CTYPE
130130
;
131131

132132
typeFuncNameKeyword

parser/sql/engine/dialect/opengauss/src/main/antlr4/imports/opengauss/DDLStatement.g4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,11 @@ createDatabaseSpecification
139139
;
140140

141141
createdbOptName
142-
: identifier
143-
| CONNECTION LIMIT
142+
: CONNECTION LIMIT
144143
| ENCODING
145-
| LOCATION
144+
| LC_COLLATE
145+
| LC_CTYPE
146+
| DBCOMPATIBILITY
146147
| OWNER
147148
| TABLESPACE
148149
| TEMPLATE

parser/sql/engine/dialect/opengauss/src/main/antlr4/imports/opengauss/OpenGaussKeyword.g4

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,14 @@ LOCATION
10611061
: L O C A T I O N
10621062
;
10631063

1064+
LC_COLLATE
1065+
: L C UL_ C O L L A T E
1066+
;
1067+
1068+
LC_CTYPE
1069+
: L C UL_ C T Y P E
1070+
;
1071+
10641072
LABEL
10651073
: L A B E L
10661074
;

0 commit comments

Comments
 (0)