@@ -329,8 +329,8 @@ make_name(void)
329329%type <str> DropTrigStmt TriggerOneEvent TriggerEvents RuleActionStmt
330330%type <str> TriggerActionTime CreateTrigStmt DropPLangStmt PLangTrusted
331331%type <str> CreatePLangStmt TriggerFuncArgs TriggerFuncArg simple_select
332- %type <str> ViewStmt LoadStmt CreatedbStmt createdb_opt_encoding
333- %type <str> createdb_opt_location opt_encoding OptInherit Geometric
332+ %type <str> ViewStmt LoadStmt CreatedbStmt createdb_opt_item
333+ %type <str> createdb_opt_list opt_encoding OptInherit Geometric
334334%type <str> DropdbStmt ClusterStmt grantee RevokeStmt Bit bit
335335%type <str> GrantStmt privileges operation_commalist operation PosAllConst
336336%type <str> opt_cursor opt_lmode ConstraintsSetStmt comment_tg AllConst
@@ -2253,7 +2253,7 @@ LoadStmt: LOAD file_name
22532253
22542254CreatedbStmt :CREATE DATABASE database_name WITH createdb_opt_list
22552255{
2256- $$ = cat_str(5 , make_str(" create database" $3 , make_str(" with" $5 , $6 );
2256+ $$ = cat_str(4 , make_str(" create database" $3 , make_str(" with" $5 );
22572257}
22582258| CREATE DATABASE database_name
22592259 {
@@ -2390,7 +2390,7 @@ OptimizableStmt: SelectStmt
23902390
23912391/* This rule used 'opt_column_list' between 'relation_name' and 'insert_rest'
23922392 * originally. When the second rule of 'insert_rest' was changed to use
2393- * the new 'SelectStmt' rule (for INTERSECT and EXCEPT) it produced a shift/red uce
2393+ * the new 'SelectStmt' rule (for INTERSECT and EXCEPT) it produced a shift/reduce
23942394 * conflict. So I just changed the rules 'InsertStmt' and 'insert_rest' to accept
23952395 * the same statements without any shift/reduce conflicts*/
23962396InsertStmt :INSERT INTO relation_name insert_rest
@@ -3550,7 +3550,7 @@ c_expr: attr
35503550{$$ = cat_str(3 , make_str(" trim(trailing" $4 , make_str(" )"
35513551| TRIM ' (' trim_list ' )'
35523552{$$ = cat_str(3 , make_str(" trim(" $3 , make_str(" )"
3553- | ' (' SelectStmt ' )'
3553+ | ' (' select_no_parens ' )'
35543554{$$ = cat_str(3 , make_str(" (" $2 , make_str(" )"
35553555| EXISTS ' (' SelectStmt ' )'
35563556{$$ = cat_str(3 , make_str(" exists(" $3 , make_str(" )"