|
11 | 11 | * |
12 | 12 | * |
13 | 13 | * IDENTIFICATION |
14 | | - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.213 2001/01/05 06:34:18 tgl Exp $ |
| 14 | + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.214 2001/01/06 10:50:02 petere Exp $ |
15 | 15 | * |
16 | 16 | * HISTORY |
17 | 17 | * AUTHORDATEMAJOR EVENT |
@@ -252,8 +252,8 @@ static void doNegateFloat(Value *v); |
252 | 252 | %type<paramno>ParamNo |
253 | 253 |
|
254 | 254 | %type<typnam>Typename,SimpleTypename,ConstTypename |
255 | | -Generic,Numeric,Geometric,Character,ConstDatetime,ConstInterval,Bit |
256 | | -%type<str>generic,character,datetime,bit |
| 255 | +GenericType,Numeric,Geometric,Character,ConstDatetime,ConstInterval,Bit |
| 256 | +%type<str>character,datetime,bit |
257 | 257 | %type<str>extract_arg |
258 | 258 | %type<str>opt_charset,opt_collate |
259 | 259 | %type<str>opt_float |
@@ -3845,26 +3845,22 @@ SimpleTypename: ConstTypename |
3845 | 3845 | |ConstInterval |
3846 | 3846 | ; |
3847 | 3847 |
|
3848 | | -ConstTypename:Generic |
| 3848 | +ConstTypename:GenericType |
3849 | 3849 | |Numeric |
3850 | 3850 | |Geometric |
3851 | 3851 | |Bit |
3852 | 3852 | |Character |
3853 | 3853 | |ConstDatetime |
3854 | 3854 | ; |
3855 | 3855 |
|
3856 | | -Generic:generic |
| 3856 | +GenericType:IDENT |
3857 | 3857 | { |
3858 | 3858 | $$ = makeNode(TypeName); |
3859 | 3859 | $$->name = xlateSqlType($1); |
3860 | 3860 | $$->typmod = -1; |
3861 | 3861 | } |
3862 | 3862 | ; |
3863 | 3863 |
|
3864 | | -generic:IDENT{$$ =$1; } |
3865 | | -|TYPE_P{$$ ="type"; } |
3866 | | -; |
3867 | | - |
3868 | 3864 | /* SQL92 numeric data types |
3869 | 3865 | * Check FLOAT() precision limits assuming IEEE floating types. |
3870 | 3866 | * Provide real DECIMAL() and NUMERIC() implementations now - Jan 1998-12-30 |
@@ -5392,7 +5388,7 @@ UserId: ColId{ $$ = $1; }; |
5392 | 5388 | * list due to shift/reduce conflicts in yacc. If so, move |
5393 | 5389 | * down to the ColLabel entity. - thomas 1997-11-06 |
5394 | 5390 | */ |
5395 | | -ColId:generic{$$ =$1; } |
| 5391 | +ColId:IDENT{$$ =$1; } |
5396 | 5392 | |datetime{$$ =$1; } |
5397 | 5393 | |TokenId{$$ =$1; } |
5398 | 5394 | |INTERVAL{$$ ="interval"; } |
@@ -5520,6 +5516,7 @@ TokenId: ABSOLUTE{ $$ = "absolute"; } |
5520 | 5516 | |TRIGGER{$$ ="trigger"; } |
5521 | 5517 | |TRUNCATE{$$ ="truncate"; } |
5522 | 5518 | |TRUSTED{$$ ="trusted"; } |
| 5519 | +|TYPE_P{$$ ="type"; } |
5523 | 5520 | |UNLISTEN{$$ ="unlisten"; } |
5524 | 5521 | |UNTIL{$$ ="until"; } |
5525 | 5522 | |UPDATE{$$ ="update"; } |
@@ -5549,6 +5546,7 @@ ColLabel: ColId{ $$ = $1; } |
5549 | 5546 | |ALL{$$ ="all"; } |
5550 | 5547 | |ANALYSE{$$ ="analyse"; }/* British*/ |
5551 | 5548 | |ANALYZE{$$ ="analyze"; } |
| 5549 | +|AND{$$ ="and"; } |
5552 | 5550 | |ANY{$$ ="any"; } |
5553 | 5551 | |ASC{$$ ="asc"; } |
5554 | 5552 | |BETWEEN{$$ ="between"; } |
@@ -5647,6 +5645,7 @@ ColLabel: ColId{ $$ = $1; } |
5647 | 5645 | |TABLE{$$ ="table"; } |
5648 | 5646 | |THEN{$$ ="then"; } |
5649 | 5647 | |TO{$$ ="to"; } |
| 5648 | +|TRAILING{$$ ="trailing"; } |
5650 | 5649 | |TRANSACTION{$$ ="transaction"; } |
5651 | 5650 | |TRIM{$$ ="trim"; } |
5652 | 5651 | |TRUE_P{$$ ="true"; } |
|