|
11 | 11 | *
|
12 | 12 | *
|
13 | 13 | * IDENTIFICATION
|
14 |
| - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.266 2001/10/2002:55:39 momjian Exp $ |
| 14 | + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.267 2001/10/2016:51:02 momjian Exp $ |
15 | 15 | *
|
16 | 16 | * HISTORY
|
17 | 17 | * AUTHORDATEMAJOR EVENT
|
@@ -3647,18 +3647,19 @@ OptUseOp: USING all_Op{ $$ = $2; }
|
3647 | 3647 | ;
|
3648 | 3648 |
|
3649 | 3649 |
|
3650 |
| -select_limit:LIMITselect_offset_value','select_limit_value |
3651 |
| -{ elog(ERROR,"LIMIT #,# syntax no longer supported. Use LIMIT # OFFSET #."); } |
3652 |
| -|LIMITselect_limit_valueOFFSETselect_offset_value |
| 3650 | +select_limit:LIMITselect_limit_valueOFFSETselect_offset_value |
3653 | 3651 | {$$ = makeList2($4,$2); }
|
3654 |
| -|LIMITselect_limit_value |
3655 |
| -{$$ = makeList2(NULL,$2); } |
3656 | 3652 | |OFFSETselect_offset_valueLIMITselect_limit_value
|
3657 | 3653 | {$$ = makeList2($2,$4); }
|
| 3654 | +|LIMITselect_limit_value |
| 3655 | +{$$ = makeList2(NULL,$2); } |
3658 | 3656 | |OFFSETselect_offset_value
|
3659 | 3657 | {$$ = makeList2($2,NULL); }
|
| 3658 | +|LIMITselect_offset_value','select_limit_value |
| 3659 | +{ elog(ERROR,"LIMIT #,# syntax no longer supported.\n\tUse separate LIMIT and OFFSET clauses."); } |
3660 | 3660 | ;
|
3661 | 3661 |
|
| 3662 | + |
3662 | 3663 | opt_select_limit:select_limit{$$ =$1; }
|
3663 | 3664 | |/* EMPTY*/{$$ = makeList2(NULL,NULL); }
|
3664 | 3665 | ;
|
|