Skip to content

Commit c2bd1fe

Browse files
peterepetere
committed
Remove redundant grammar symbols
access_method, database_name, and index_name are all just name, and they are not used consistently for their alleged purpose, so remove them. They have been around since ancient times but have no current reason for existing. Removing them can simplify future grammar refactoring. Discussion: https://www.postgresql.org/message-id/flat/163c00a5-f634-ca52-fc7c-0e53deda8735%402ndquadrant.com
1 parent c7eab0e commit c2bd1fe

File tree

2 files changed

+41
-49
lines changed

2 files changed

+41
-49
lines changed

‎src/backend/parser/gram.y

+39-47
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
352352
%type <chr> enable_trigger
353353

354354
%type <str> copy_file_name
355-
database_name access_method_clause access_method attr_name
355+
access_method_clause attr_name
356356
table_access_method_clause name cursor_name file_name
357-
index_name opt_index_name cluster_index_specification
357+
opt_index_name cluster_index_specification
358358

359359
%type <list> func_name handler_name qual_Op qual_all_Op subquery_Op
360360
opt_class opt_inline_handler opt_validator validator_clause
@@ -1183,7 +1183,7 @@ AlterRoleStmt:
11831183

11841184
opt_in_database:
11851185
/* EMPTY */ { $$ = NULL; }
1186-
| IN_P DATABASE database_name { $$ = $3; }
1186+
| IN_P DATABASE name { $$ = $3; }
11871187
;
11881188

11891189
AlterRoleSetStmt:
@@ -3945,7 +3945,7 @@ part_elem: ColId opt_collate opt_class
39453945
;
39463946

39473947
table_access_method_clause:
3948-
USING access_method { $$ = $2; }
3948+
USING name { $$ = $2; }
39493949
| /*EMPTY*/ { $$ = NULL; }
39503950
;
39513951

@@ -3970,7 +3970,7 @@ OptConsTableSpace: USING INDEX TABLESPACE name { $$ = $4; }
39703970
| /*EMPTY*/ { $$ = NULL; }
39713971
;
39723972

3973-
ExistingIndex: USING INDEX index_name { $$ = $3; }
3973+
ExistingIndex: USING INDEX name { $$ = $3; }
39743974
;
39753975

39763976
/*****************************************************************************
@@ -4635,7 +4635,7 @@ AlterExtensionContentsStmt:
46354635
n->object = (Node *) $6;
46364636
$$ = (Node *)n;
46374637
}
4638-
| ALTER EXTENSION name add_drop OPERATOR CLASS any_name USING access_method
4638+
| ALTER EXTENSION name add_drop OPERATOR CLASS any_name USING name
46394639
{
46404640
AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
46414641
n->extname = $3;
@@ -4644,7 +4644,7 @@ AlterExtensionContentsStmt:
46444644
n->object = (Node *) lcons(makeString($9), $7);
46454645
$$ = (Node *)n;
46464646
}
4647-
| ALTER EXTENSION name add_drop OPERATOR FAMILY any_name USING access_method
4647+
| ALTER EXTENSION name add_drop OPERATOR FAMILY any_name USING name
46484648
{
46494649
AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
46504650
n->extname = $3;
@@ -5987,7 +5987,7 @@ opt_if_not_exists: IF_P NOT EXISTS { $$ = true; }
59875987

59885988
CreateOpClassStmt:
59895989
CREATE OPERATOR CLASS any_name opt_default FOR TYPE_P Typename
5990-
USING access_method opt_opfamily AS opclass_item_list
5990+
USING name opt_opfamily AS opclass_item_list
59915991
{
59925992
CreateOpClassStmt *n = makeNode(CreateOpClassStmt);
59935993
n->opclassname = $4;
@@ -6086,7 +6086,7 @@ opt_recheck: RECHECK
60866086

60876087

60886088
CreateOpFamilyStmt:
6089-
CREATE OPERATOR FAMILY any_name USING access_method
6089+
CREATE OPERATOR FAMILY any_name USING name
60906090
{
60916091
CreateOpFamilyStmt *n = makeNode(CreateOpFamilyStmt);
60926092
n->opfamilyname = $4;
@@ -6096,7 +6096,7 @@ CreateOpFamilyStmt:
60966096
;
60976097

60986098
AlterOpFamilyStmt:
6099-
ALTER OPERATOR FAMILY any_name USING access_method ADD_P opclass_item_list
6099+
ALTER OPERATOR FAMILY any_name USING name ADD_P opclass_item_list
61006100
{
61016101
AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
61026102
n->opfamilyname = $4;
@@ -6105,7 +6105,7 @@ AlterOpFamilyStmt:
61056105
n->items = $8;
61066106
$$ = (Node *) n;
61076107
}
6108-
| ALTER OPERATOR FAMILY any_name USING access_method DROP opclass_drop_list
6108+
| ALTER OPERATOR FAMILY any_name USING name DROP opclass_drop_list
61096109
{
61106110
AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
61116111
n->opfamilyname = $4;
@@ -6142,7 +6142,7 @@ opclass_drop:
61426142

61436143

61446144
DropOpClassStmt:
6145-
DROP OPERATOR CLASS any_name USING access_method opt_drop_behavior
6145+
DROP OPERATOR CLASS any_name USING name opt_drop_behavior
61466146
{
61476147
DropStmt *n = makeNode(DropStmt);
61486148
n->objects = list_make1(lcons(makeString($6), $4));
@@ -6152,7 +6152,7 @@ DropOpClassStmt:
61526152
n->concurrent = false;
61536153
$$ = (Node *) n;
61546154
}
6155-
| DROP OPERATOR CLASS IF_P EXISTS any_name USING access_method opt_drop_behavior
6155+
| DROP OPERATOR CLASS IF_P EXISTS any_name USING name opt_drop_behavior
61566156
{
61576157
DropStmt *n = makeNode(DropStmt);
61586158
n->objects = list_make1(lcons(makeString($8), $6));
@@ -6165,7 +6165,7 @@ DropOpClassStmt:
61656165
;
61666166

61676167
DropOpFamilyStmt:
6168-
DROP OPERATOR FAMILY any_name USING access_method opt_drop_behavior
6168+
DROP OPERATOR FAMILY any_name USING name opt_drop_behavior
61696169
{
61706170
DropStmt *n = makeNode(DropStmt);
61716171
n->objects = list_make1(lcons(makeString($6), $4));
@@ -6175,7 +6175,7 @@ DropOpFamilyStmt:
61756175
n->concurrent = false;
61766176
$$ = (Node *) n;
61776177
}
6178-
| DROP OPERATOR FAMILY IF_P EXISTS any_name USING access_method opt_drop_behavior
6178+
| DROP OPERATOR FAMILY IF_P EXISTS any_name USING name opt_drop_behavior
61796179
{
61806180
DropStmt *n = makeNode(DropStmt);
61816181
n->objects = list_make1(lcons(makeString($8), $6));
@@ -6582,15 +6582,15 @@ CommentStmt:
65826582
n->comment = $8;
65836583
$$ = (Node *) n;
65846584
}
6585-
| COMMENT ON OPERATOR CLASS any_name USING access_method IS comment_text
6585+
| COMMENT ON OPERATOR CLASS any_name USING name IS comment_text
65866586
{
65876587
CommentStmt *n = makeNode(CommentStmt);
65886588
n->objtype = OBJECT_OPCLASS;
65896589
n->object = (Node *) lcons(makeString($7), $5);
65906590
n->comment = $9;
65916591
$$ = (Node *) n;
65926592
}
6593-
| COMMENT ON OPERATOR FAMILY any_name USING access_method IS comment_text
6593+
| COMMENT ON OPERATOR FAMILY any_name USING name IS comment_text
65946594
{
65956595
CommentStmt *n = makeNode(CommentStmt);
65966596
n->objtype = OBJECT_OPFAMILY;
@@ -7432,7 +7432,7 @@ IndexStmt: CREATE opt_unique INDEX opt_concurrently opt_index_name
74327432
n->reset_default_tblspc = false;
74337433
$$ = (Node *)n;
74347434
}
7435-
| CREATE opt_unique INDEX opt_concurrently IF_P NOT EXISTS index_name
7435+
| CREATE opt_unique INDEX opt_concurrently IF_P NOT EXISTS name
74367436
ON relation_expr access_method_clause '(' index_params ')'
74377437
opt_include opt_reloptions OptTableSpace where_clause
74387438
{
@@ -7475,12 +7475,12 @@ opt_concurrently:
74757475
;
74767476

74777477
opt_index_name:
7478-
index_name { $$ = $1; }
7478+
name { $$ = $1; }
74797479
| /*EMPTY*/ { $$ = NULL; }
74807480
;
74817481

74827482
access_method_clause:
7483-
USING access_method { $$ = $2; }
7483+
USING name { $$ = $2; }
74847484
| /*EMPTY*/ { $$ = DEFAULT_INDEX_TYPE; }
74857485
;
74867486

@@ -8527,7 +8527,7 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
85278527
n->missing_ok = false;
85288528
$$ = (Node *)n;
85298529
}
8530-
| ALTER DATABASE database_name RENAME TO database_name
8530+
| ALTER DATABASE name RENAME TO name
85318531
{
85328532
RenameStmt *n = makeNode(RenameStmt);
85338533
n->renameType = OBJECT_DATABASE;
@@ -8590,7 +8590,7 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
85908590
n->missing_ok = false;
85918591
$$ = (Node *)n;
85928592
}
8593-
| ALTER OPERATOR CLASS any_name USING access_method RENAME TO name
8593+
| ALTER OPERATOR CLASS any_name USING name RENAME TO name
85948594
{
85958595
RenameStmt *n = makeNode(RenameStmt);
85968596
n->renameType = OBJECT_OPCLASS;
@@ -8599,7 +8599,7 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
85998599
n->missing_ok = false;
86008600
$$ = (Node *)n;
86018601
}
8602-
| ALTER OPERATOR FAMILY any_name USING access_method RENAME TO name
8602+
| ALTER OPERATOR FAMILY any_name USING name RENAME TO name
86038603
{
86048604
RenameStmt *n = makeNode(RenameStmt);
86058605
n->renameType = OBJECT_OPFAMILY;
@@ -9179,7 +9179,7 @@ AlterObjectSchemaStmt:
91799179
n->missing_ok = false;
91809180
$$ = (Node *)n;
91819181
}
9182-
| ALTER OPERATOR CLASS any_name USING access_method SET SCHEMA name
9182+
| ALTER OPERATOR CLASS any_name USING name SET SCHEMA name
91839183
{
91849184
AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
91859185
n->objectType = OBJECT_OPCLASS;
@@ -9188,7 +9188,7 @@ AlterObjectSchemaStmt:
91889188
n->missing_ok = false;
91899189
$$ = (Node *)n;
91909190
}
9191-
| ALTER OPERATOR FAMILY any_name USING access_method SET SCHEMA name
9191+
| ALTER OPERATOR FAMILY any_name USING name SET SCHEMA name
91929192
{
91939193
AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
91949194
n->objectType = OBJECT_OPFAMILY;
@@ -9444,7 +9444,7 @@ AlterOwnerStmt: ALTER AGGREGATE aggregate_with_argtypes OWNER TO RoleSpec
94449444
n->newowner = $6;
94459445
$$ = (Node *)n;
94469446
}
9447-
| ALTER DATABASE database_name OWNER TO RoleSpec
9447+
| ALTER DATABASE name OWNER TO RoleSpec
94489448
{
94499449
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
94509450
n->objectType = OBJECT_DATABASE;
@@ -9492,15 +9492,15 @@ AlterOwnerStmt: ALTER AGGREGATE aggregate_with_argtypes OWNER TO RoleSpec
94929492
n->newowner = $6;
94939493
$$ = (Node *)n;
94949494
}
9495-
| ALTER OPERATOR CLASS any_name USING access_method OWNER TO RoleSpec
9495+
| ALTER OPERATOR CLASS any_name USING name OWNER TO RoleSpec
94969496
{
94979497
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
94989498
n->objectType = OBJECT_OPCLASS;
94999499
n->object = (Node *) lcons(makeString($6), $4);
95009500
n->newowner = $9;
95019501
$$ = (Node *)n;
95029502
}
9503-
| ALTER OPERATOR FAMILY any_name USING access_method OWNER TO RoleSpec
9503+
| ALTER OPERATOR FAMILY any_name USING name OWNER TO RoleSpec
95049504
{
95059505
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
95069506
n->objectType = OBJECT_OPFAMILY;
@@ -10204,7 +10204,7 @@ LoadStmt: LOAD file_name
1020410204
*****************************************************************************/
1020510205

1020610206
CreatedbStmt:
10207-
CREATE DATABASE database_name opt_with createdb_opt_list
10207+
CREATE DATABASE name opt_with createdb_opt_list
1020810208
{
1020910209
CreatedbStmt *n = makeNode(CreatedbStmt);
1021010210
n->dbname = $3;
@@ -10275,21 +10275,21 @@ opt_equal: '=' {}
1027510275
*****************************************************************************/
1027610276

1027710277
AlterDatabaseStmt:
10278-
ALTER DATABASE database_name WITH createdb_opt_list
10278+
ALTER DATABASE name WITH createdb_opt_list
1027910279
{
1028010280
AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
1028110281
n->dbname = $3;
1028210282
n->options = $5;
1028310283
$$ = (Node *)n;
1028410284
}
10285-
| ALTER DATABASE database_name createdb_opt_list
10285+
| ALTER DATABASE name createdb_opt_list
1028610286
{
1028710287
AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
1028810288
n->dbname = $3;
1028910289
n->options = $4;
1029010290
$$ = (Node *)n;
1029110291
}
10292-
| ALTER DATABASE database_name SET TABLESPACE name
10292+
| ALTER DATABASE name SET TABLESPACE name
1029310293
{
1029410294
AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
1029510295
n->dbname = $3;
@@ -10300,7 +10300,7 @@ AlterDatabaseStmt:
1030010300
;
1030110301

1030210302
AlterDatabaseSetStmt:
10303-
ALTER DATABASE database_name SetResetClause
10303+
ALTER DATABASE name SetResetClause
1030410304
{
1030510305
AlterDatabaseSetStmt *n = makeNode(AlterDatabaseSetStmt);
1030610306
n->dbname = $3;
@@ -10317,31 +10317,31 @@ AlterDatabaseSetStmt:
1031710317
* This is implicitly CASCADE, no need for drop behavior
1031810318
*****************************************************************************/
1031910319

10320-
DropdbStmt: DROP DATABASE database_name
10320+
DropdbStmt: DROP DATABASE name
1032110321
{
1032210322
DropdbStmt *n = makeNode(DropdbStmt);
1032310323
n->dbname = $3;
1032410324
n->missing_ok = false;
1032510325
n->options = NULL;
1032610326
$$ = (Node *)n;
1032710327
}
10328-
| DROP DATABASE IF_P EXISTS database_name
10328+
| DROP DATABASE IF_P EXISTS name
1032910329
{
1033010330
DropdbStmt *n = makeNode(DropdbStmt);
1033110331
n->dbname = $5;
1033210332
n->missing_ok = true;
1033310333
n->options = NULL;
1033410334
$$ = (Node *)n;
1033510335
}
10336-
| DROP DATABASE database_name opt_with '(' drop_option_list ')'
10336+
| DROP DATABASE name opt_with '(' drop_option_list ')'
1033710337
{
1033810338
DropdbStmt *n = makeNode(DropdbStmt);
1033910339
n->dbname = $3;
1034010340
n->missing_ok = false;
1034110341
n->options = $6;
1034210342
$$ = (Node *)n;
1034310343
}
10344-
| DROP DATABASE IF_P EXISTS database_name opt_with '(' drop_option_list ')'
10344+
| DROP DATABASE IF_P EXISTS name opt_with '(' drop_option_list ')'
1034510345
{
1034610346
DropdbStmt *n = makeNode(DropdbStmt);
1034710347
n->dbname = $5;
@@ -10643,7 +10643,7 @@ ClusterStmt:
1064310643
$$ = (Node*)n;
1064410644
}
1064510645
/* kept for pre-8.3 compatibility */
10646-
| CLUSTER opt_verbose index_name ON qualified_name
10646+
| CLUSTER opt_verbose name ON qualified_name
1064710647
{
1064810648
ClusterStmt *n = makeNode(ClusterStmt);
1064910649
n->relation = $5;
@@ -10656,7 +10656,7 @@ ClusterStmt:
1065610656
;
1065710657

1065810658
cluster_index_specification:
10659-
USING index_name { $$ = $2; }
10659+
USING name { $$ = $2; }
1066010660
| /*EMPTY*/ { $$ = NULL; }
1066110661
;
1066210662

@@ -14995,16 +14995,8 @@ name_list: name
1499514995

1499614996
name: ColId { $$ = $1; };
1499714997

14998-
database_name:
14999-
ColId { $$ = $1; };
15000-
15001-
access_method:
15002-
ColId { $$ = $1; };
15003-
1500414998
attr_name: ColLabel { $$ = $1; };
1500514999

15006-
index_name: ColId { $$ = $1; };
15007-
1500815000
file_name: Sconst { $$ = $1; };
1500915001

1501015002
/*

‎src/interfaces/ecpg/preproc/ecpg.trailer

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ connection_target: opt_database_name opt_server opt_port
114114
}
115115
;
116116

117-
opt_database_name: database_name { $$ = $1; }
117+
opt_database_name: name { $$ = $1; }
118118
| /*EMPTY*/ { $$ = EMPTY; }
119119
;
120120

@@ -962,7 +962,7 @@ dis_name: connection_object { $$ = $1; }
962962
| /* EMPTY */ { $$ = mm_strdup("\"CURRENT\""); }
963963
;
964964

965-
connection_object: database_name { $$ = make3_str(mm_strdup("\""), $1, mm_strdup("\"")); }
965+
connection_object: name { $$ = make3_str(mm_strdup("\""), $1, mm_strdup("\"")); }
966966
| DEFAULT { $$ = mm_strdup("\"DEFAULT\""); }
967967
| char_variable { $$ = $1; }
968968
;

0 commit comments

Comments
 (0)