diff options
| author | Michael Meskes <meskes@postgresql.org> | 2003-08-25 13:44:00 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2003-08-25 13:44:00 +0000 |
| commit | 4b02f3c4eb447f02eb02d6549403a86b96c9b237 (patch) | |
| tree | 4361a3d9e282441a1e8befb2489988a46fac5e9d /src/interfaces/ecpg/preproc | |
| parent | 048cb1ce6b9465842bd526a056d86d3c4b92f327 (diff) | |
Synced parser and fixed a bug in error output to log file.
Diffstat (limited to 'src/interfaces/ecpg/preproc')
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 14f51f8460d..7cd7b263891 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.251 2003/08/06 15:54:06 tgl Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.252 2003/08/25 13:44:00 meskes Exp $ */ /* Copyright comment */ %{ @@ -420,7 +420,7 @@ adjust_informix(struct arguments *list) %type <str> row_descriptor ConstDatetime AlterDomainStmt AlterSeqStmt %type <str> SelectStmt into_clause OptTemp ConstraintAttributeSpec %type <str> opt_table opt_all sort_clause sortby_list ConstraintAttr -%type <str> sortby OptUseOp qualified_name_list name_list ColId_or_Sconst +%type <str> sortby qualified_name_list name_list ColId_or_Sconst %type <str> group_clause having_clause from_clause opt_distinct opt_hold %type <str> join_outer where_clause relation_expr sub_type opt_arg %type <str> opt_column_list insert_rest InsertStmt @@ -2887,14 +2887,14 @@ sortby_list: sortby { $$ = $1; } | sortby_list ',' sortby { $$ = cat_str(3, $1, make_str(","), $3); } ; -sortby: a_expr OptUseOp - { $$ = cat2_str($1, $2); } - ; - -OptUseOp: USING all_Op { $$ = cat2_str(make_str("using"), $2); } - | ASC { $$ = make_str("asc"); } - | DESC { $$ = make_str("desc"); } - | /*EMPTY*/ { $$ = EMPTY; } +sortby: a_expr USING qual_all_Op + { $$ = cat_str(3, $1, make_str("using"), $3); } + | a_expr ASC + { $$ = cat2_str($1, make_str("asc")); } + | a_expr DESC + { $$ = cat2_str($1, make_str("desc")); } + | a_expr + { $$ = $1; } ; select_limit: LIMIT select_limit_value OFFSET select_offset_value |