|
11 | 11 | * |
12 | 12 | * |
13 | 13 | * IDENTIFICATION |
14 | | - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.430 2003/08/22 20:34:33 tgl Exp $ |
| 14 | + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.431 2003/09/06 14:01:51 petere Exp $ |
15 | 15 | * |
16 | 16 | * HISTORY |
17 | 17 | * AUTHORDATEMAJOR EVENT |
@@ -294,7 +294,7 @@ static void doNegateFloat(Value *v); |
294 | 294 | BitConstBitBitWithLengthBitWithoutLength |
295 | 295 | %type<str>character |
296 | 296 | %type<str>extract_arg |
297 | | -%type<str>opt_charsetopt_collate |
| 297 | +%type<str>opt_charset |
298 | 298 | %type<ival>opt_numericopt_decimal |
299 | 299 | %type<boolean>opt_varyingopt_timezone |
300 | 300 |
|
@@ -441,7 +441,6 @@ static void doNegateFloat(Value *v); |
441 | 441 | %rightUMINUS |
442 | 442 | %left'['']' |
443 | 443 | %left'('')' |
444 | | -%leftCOLLATE |
445 | 444 | %leftTYPECAST |
446 | 445 | %left'.' |
447 | 446 | /* |
@@ -1461,19 +1460,13 @@ TableElement: |
1461 | 1460 | |TableConstraint{$$ =$1; } |
1462 | 1461 | ; |
1463 | 1462 |
|
1464 | | -columnDef:ColIdTypenameColQualListopt_collate |
| 1463 | +columnDef:ColIdTypenameColQualList |
1465 | 1464 | { |
1466 | 1465 | ColumnDef *n = makeNode(ColumnDef); |
1467 | 1466 | n->colname =$1; |
1468 | 1467 | n->typename =$2; |
1469 | 1468 | n->constraints =$3; |
1470 | 1469 | n->is_local =true; |
1471 | | - |
1472 | | -if ($4 !=NULL) |
1473 | | -ereport(NOTICE, |
1474 | | -(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), |
1475 | | - errmsg("CREATE TABLE / COLLATE is not yet implemented; clause ignored"))); |
1476 | | - |
1477 | 1470 | $$ = (Node *)n; |
1478 | 1471 | } |
1479 | 1472 | ; |
@@ -3843,17 +3836,12 @@ DropdbStmt: DROP DATABASE database_name |
3843 | 3836 | *****************************************************************************/ |
3844 | 3837 |
|
3845 | 3838 | CreateDomainStmt: |
3846 | | -CREATE DOMAIN_P any_name opt_as Typename ColQualList opt_collate |
| 3839 | +CREATE DOMAIN_P any_name opt_as Typename ColQualList |
3847 | 3840 | { |
3848 | 3841 | CreateDomainStmt *n =makeNode(CreateDomainStmt); |
3849 | 3842 | n->domainname = $3; |
3850 | 3843 | n->typename = $5; |
3851 | 3844 | n->constraints = $6; |
3852 | | - |
3853 | | -if ($7 !=NULL) |
3854 | | -ereport(NOTICE, |
3855 | | -(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), |
3856 | | -errmsg("CREATE DOMAIN / COLLATE is not yet implemented; clause ignored"))); |
3857 | 3845 | $$ = (Node *)n; |
3858 | 3846 | } |
3859 | 3847 | ; |
@@ -5463,11 +5451,6 @@ opt_charset: |
5463 | 5451 | |/*EMPTY*/{ $$ =NULL; } |
5464 | 5452 | ; |
5465 | 5453 |
|
5466 | | -opt_collate: |
5467 | | -COLLATE ColId{ $$ = $2; } |
5468 | | -|/*EMPTY*/{ $$ =NULL; } |
5469 | | -; |
5470 | | - |
5471 | 5454 | ConstDatetime: |
5472 | 5455 | TIMESTAMP'(' Iconst')' opt_timezone |
5473 | 5456 | { |
@@ -5753,15 +5736,6 @@ qual_all_Op: |
5753 | 5736 | a_expr:c_expr{ $$ = $1; } |
5754 | 5737 | | a_expr TYPECAST Typename |
5755 | 5738 | { $$ =makeTypeCast($1, $3); } |
5756 | | -| a_expr COLLATE ColId |
5757 | | -{ |
5758 | | -FuncCall *n =makeNode(FuncCall); |
5759 | | -n->funcname =SystemFuncName($3); |
5760 | | -n->args =makeList1($1); |
5761 | | -n->agg_star =FALSE; |
5762 | | -n->agg_distinct =FALSE; |
5763 | | -$$ = (Node *) n; |
5764 | | -} |
5765 | 5739 | | a_expr AT TIME ZONE c_expr |
5766 | 5740 | { |
5767 | 5741 | FuncCall *n =makeNode(FuncCall); |
|