@@ -294,7 +294,7 @@ make_name(void)
294294%type <str> opt_indirection expr_list extract_list extract_arg
295295%type <str> position_list substr_list substr_from alter_column_action
296296%type <str> trim_list in_expr substr_for attr attrs drop_behavior
297- %type <str> Typename SimpleTypename Generic Numeric generic opt_float opt_numeric
297+ %type <str> Typename SimpleTypename GenericType Numeric opt_float opt_numeric
298298%type <str> opt_decimal Character character opt_varying opt_charset
299299%type <str> opt_collate datetime opt_timezone opt_interval table_ref
300300%type <str> row_expr row_descriptor row_list ConstDatetime opt_chain
@@ -2928,22 +2928,15 @@ SimpleTypename: ConstTypename{ $$ = $1; }
29282928| ConstInterval {$$ =$1 ; }
29292929 ;
29302930
2931- ConstTypename :Generic {$$ =$1 ; }
2931+ ConstTypename :GenericType {$$ =$1 ; }
29322932| ConstDatetime {$$ =$1 ; }
29332933| Numeric {$$ =$1 ; }
29342934| Geometric {$$ =$1 ; }
29352935| Bit {$$ =$1 ; }
29362936| Character {$$ =$1 ; }
29372937;
29382938
2939- Generic :generic
2940- {
2941- $$ =$1 ;
2942- }
2943- ;
2944-
2945- generic :ident {$$ =$1 ; }
2946- | TYPE_P {$$ = make_str(" type" ); }
2939+ GenericType :ident {$$ =$1 ; }
29472940| ECPGKeywords {$$ =$1 ; }
29482941| ECPGTypeName {$$ =$1 ; }
29492942;
@@ -5076,6 +5069,7 @@ TokenId: ABSOLUTE{ $$ = make_str("absolute"); }
50765069| TRIGGER {$$ = make_str(" trigger" ); }
50775070| TRUNCATE {$$ = make_str(" truncate" ); }
50785071| TRUSTED {$$ = make_str(" trusted" ); }
5072+ | TYPE_P {$$ = make_str(" type" ); }
50795073| UNLISTEN {$$ = make_str(" unlisten" ); }
50805074| UNTIL {$$ = make_str(" until" ); }
50815075| UPDATE {$$ = make_str(" update" ); }
@@ -5109,6 +5103,7 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
51095103| ALL {$$ = make_str(" all" ); }
51105104| ANALYSE {$$ = make_str(" analyse" ); }
51115105| ANALYZE {$$ = make_str(" analyze" ); }
5106+ | AND {$$ = make_str(" and" ); }
51125107| ANY {$$ = make_str(" any" ); }
51135108| ASC {$$ = make_str(" asc" ); }
51145109| BETWEEN {$$ = make_str(" between" ); }
@@ -5203,6 +5198,7 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
52035198| TABLE {$$ = make_str(" table" ); }
52045199| THEN {$$ = make_str(" then" ); }
52055200| TO {$$ = make_str(" to" ); }
5201+ | TRAILING {$$ = make_str(" trailing" ); }
52065202| TRANSACTION {$$ = make_str(" transaction" ); }
52075203| TRIM {$$ = make_str(" trim" ); }
52085204| TRUE_P {$$ = make_str(" true" ); }