diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 20c514725b..b3046c04b2 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.636 2008/11/12 15:50:20 meskes Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.637 2008/11/13 11:10:06 meskes Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -330,7 +330,7 @@ static TypeName *TableFuncTypeName(List *columns); %type sub_type %type OptCreateAs CreateAsList %type CreateAsElement ctext_expr -%type NumericOnly FloatOnly IntegerOnly +%type NumericOnly %type alias_clause %type sortby %type index_elem @@ -1525,13 +1525,13 @@ alter_table_cmd: n->name = $3; $$ = (Node *)n; } - /* ALTER TABLE ALTER [COLUMN] SET STATISTICS */ - | ALTER opt_column ColId SET STATISTICS IntegerOnly + /* ALTER TABLE ALTER [COLUMN] SET STATISTICS */ + | ALTER opt_column ColId SET STATISTICS SignedIconst { AlterTableCmd *n = makeNode(AlterTableCmd); n->subtype = AT_SetStatistics; n->name = $3; - n->def = (Node *) $6; + n->def = (Node *) makeInteger($6); $$ = (Node *)n; } /* ALTER TABLE ALTER [COLUMN] SET STORAGE */ @@ -2577,21 +2577,15 @@ opt_by: BY {} ; NumericOnly: - FloatOnly { $$ = $1; } - | IntegerOnly { $$ = $1; } - ; - -FloatOnly: FCONST { $$ = makeFloat($1); } + FCONST { $$ = makeFloat($1); } | '-' FCONST { $$ = makeFloat($2); doNegateFloat($$); } + | SignedIconst { $$ = makeInteger($1); }; ; -IntegerOnly: SignedIconst { $$ = makeInteger($1); }; - - /***************************************************************************** * * QUERIES :