mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified sortby rule

Browse Source
This commit is contained in:
Michael Meskes 2007-03-17 19:27:12 +00:00
parent d3e131e062
commit 582e22a8c3
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.581 2007/03/13 00:33:41 tgl Exp $ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.582 2007/03/17 19:27:12 meskes Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -3869,8 +3869,8 @@ opt_class: any_name { $$ = $1; }
; ;
opt_asc_desc: ASC { $$ = SORTBY_ASC; } opt_asc_desc: ASC { $$ = SORTBY_ASC; }
| DESC { $$ = SORTBY_DESC; } | DESC { $$ = SORTBY_DESC; }
| /*EMPTY*/ { $$ = SORTBY_DEFAULT; } | /*EMPTY*/ { $$ = SORTBY_DEFAULT; }
; ;
opt_nulls_order: NULLS_FIRST { $$ = SORTBY_NULLS_FIRST; } opt_nulls_order: NULLS_FIRST { $$ = SORTBY_NULLS_FIRST; }
@ -5982,30 +5982,14 @@ sortby: a_expr USING qual_all_Op opt_nulls_order
$$->sortby_nulls = $4; $$->sortby_nulls = $4;
$$->useOp = $3; $$->useOp = $3;
} }
| a_expr ASC opt_nulls_order | a_expr opt_asc_desc opt_nulls_order
{ {
$$ = makeNode(SortBy); $$ = makeNode(SortBy);
$$->node = $1; $$->node = $1;
$$->sortby_dir = SORTBY_ASC; $$->sortby_dir = $2;
$$->sortby_nulls = $3; $$->sortby_nulls = $3;
$$->useOp = NIL; $$->useOp = NIL;
} }
| a_expr DESC opt_nulls_order
{
$$ = makeNode(SortBy);
$$->node = $1;
$$->sortby_dir = SORTBY_DESC;
$$->sortby_nulls = $3;
$$->useOp = NIL;
}
| a_expr opt_nulls_order
{
$$ = makeNode(SortBy);
$$->node = $1;
$$->sortby_dir = SORTBY_DEFAULT;
$$->sortby_nulls = $2;
$$->useOp = NIL;
}
; ;