hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1461 add nvarchar keyword to be compatible with databaseB

Browse Source 
Merge pull request !1461 from 仲夏十三/nvarchar
This commit is contained in:
opengauss-bot
2022-01-22 07:49:19 +00:00
committed by Gitee
parent 23ddd1ca38 0bfb8e3ba7
commit e1258c4197
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/backend/parser/gram.y
View File

@ -824,7 +824,7 @@ static int errstate;
MAPPING MASKING MASTER MATCH MATERIALIZED MATCHED MAXEXTENTS MAXSIZE MAXTRANS MAXVALUE MERGE MINUS_P MINUTE_P MINVALUE MINEXTENTS MODE MODIFY_P MONTH_P MOVE MOVEMENT
MODEL // DB4AI
NAME_P NAMES NATIONAL NATURAL NCHAR NEXT NO NOCOMPRESS NOCYCLE NODE NOLOGGING NOMAXVALUE NOMINVALUE NONE
NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLCOLS NULLIF NULLS_P NUMBER_P NUMERIC NUMSTR NVARCHAR2 NVL
NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLCOLS NULLIF NULLS_P NUMBER_P NUMERIC NUMSTR NVARCHAR NVARCHAR2 NVL
OBJECT_P OF OFF OFFSET OIDS ON ONLY OPERATOR OPTIMIZATION OPTION OPTIONALLY OPTIONS OR
ORDER OUT_P OUTER_P OVER OVERLAPS OVERLAY OWNED OWNER
@ -20084,6 +20084,8 @@ character: CHARACTER opt_varying
{ $$ = (char *)($2 ? "varchar": "bpchar"); }
| CHAR_P opt_varying
{ $$ = (char *)($2 ? "varchar": "bpchar"); }
| NVARCHAR
{ $$ = "nvarchar2"; }
| NVARCHAR2
{ $$ = "nvarchar2"; }
| VARCHAR
@ -23646,6 +23648,7 @@ col_name_keyword:
| NULLIF
| NUMBER_P
| NUMERIC
| NVARCHAR
| NVARCHAR2
| NVL
| OUT_P

5
src/common/interfaces/libpq/frontend_parser/gram.y
View File

@ -543,7 +543,7 @@ extern THR_LOCAL bool stmt_contains_operator_plus;
MAPPING MASKING MASTER MASTR MATCH MATERIALIZED MATCHED MAXEXTENTS MAXSIZE MAXTRANS MAXVALUE MERGE MINUS_P MINUTE_P MINVALUE MINEXTENTS MODE MODIFY_P MONTH_P MOVE MOVEMENT
MODEL // DB4AI
NAME_P NAMES NATIONAL NATURAL NCHAR NEXT NLSSORT NO NOCOMPRESS NOCYCLE NODE NOLOGGING NOMAXVALUE NOMINVALUE NONE
NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLCOLS NULLIF NULLS_P NUMBER_P NUMERIC NUMSTR NVARCHAR2 NVL
NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLCOLS NULLIF NULLS_P NUMBER_P NUMERIC NUMSTR NVARCHAR NVARCHAR2 NVL
OBJECT_P OF OFF OFFSET OIDS ON ONLY OPERATOR OPTIMIZATION OPTION OPTIONALLY OPTIONS OR
ORDER OUT_P OUTER_P OVER OVERLAPS OVERLAY OWNED OWNER
@ -8214,6 +8214,8 @@ character: CHARACTER opt_varying
{ $$ = (char *)($2 ? "varchar": "bpchar"); }
| CHAR_P opt_varying
{ $$ = (char *)($2 ? "varchar": "bpchar"); }
| NVARCHAR
{ $$ = "nvarchar2"; }
| NVARCHAR2
{ $$ = "nvarchar2"; }
| VARCHAR
@ -11445,6 +11447,7 @@ col_name_keyword:
| NULLIF
| NUMBER_P
| NUMERIC
| NVARCHAR
| NVARCHAR2
| NVL
| OUT_P

1
src/include/parser/kwlist.h
View File

@ -395,6 +395,7 @@ PG_KEYWORD("nulls", NULLS_P, UNRESERVED_KEYWORD)
PG_KEYWORD("number", NUMBER_P, COL_NAME_KEYWORD)
PG_KEYWORD("numeric", NUMERIC, COL_NAME_KEYWORD)
PG_KEYWORD("numstr", NUMSTR, UNRESERVED_KEYWORD)
PG_KEYWORD("nvarchar", NVARCHAR, COL_NAME_KEYWORD)
PG_KEYWORD("nvarchar2", NVARCHAR2, COL_NAME_KEYWORD)
PG_KEYWORD("nvl", NVL, COL_NAME_KEYWORD)
PG_KEYWORD("object", OBJECT_P, UNRESERVED_KEYWORD)

2
src/test/regress/parallel_schedule0
View File

@ -26,7 +26,7 @@ test: single_node_tablespace
# The first group of parallel tests
# ----------
test: single_node_boolean single_node_char single_node_name single_node_varchar single_node_text single_node_int2 single_node_int4 single_node_int8 single_node_oid single_node_float4 single_node_float8 single_node_bit single_node_numeric single_node_txid single_node_uuid single_node_enum single_node_money
#test: single_node_nvarchar
test: single_node_nvarchar
# Depends on things setup during char, varchar and text
#test: single_node_strings